Merging upstream version 2.4.59.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 28 insertions, 9 deletions

diff --git a/README b/README
index 6033744..f1f6d78 100644
--- a/README
+++ b/README
@@ -16,7 +16,7 @@
   ------------------
 
   Details of the latest version can be found on the Apache HTTP
-  server project page under http://httpd.apache.org/.
+  server project page under https://httpd.apache.org/.
 
   Documentation
   -------------
@@ -24,7 +24,7 @@
   The documentation available as of the date of this release is
   included in HTML format in the docs/manual/ directory.  The most
   up-to-date documentation can be found at
-  http://httpd.apache.org/docs/2.4/.
+  https://httpd.apache.org/docs/2.4/.
 
   Installation
   ------------
@@ -46,7 +46,7 @@
   to another country, of encryption software.  BEFORE using any encryption
   software, please check your country's laws, regulations and policies
   concerning the import, possession, or use, and re-export of encryption
-  software, to see if this is permitted.  See <http://www.wassenaar.org/>
+  software, to see if this is permitted.  See <https://www.wassenaar.org/>
   for more information.
 
   The U.S. Government Department of Commerce, Bureau of Industry and
@@ -82,7 +82,7 @@
     Some object code distributions of Apache httpd, indicated with the
     word "crypto" in the package name, may include object code for the
     OpenSSL encryption library as distributed in open source form from
-    <http://www.openssl.org/source/>.
+    <https://www.openssl.org/source/>.
 
   The above files are optional and may be removed if the cryptographic
   functionality is not desired or needs to be excluded from redistribution.
@@ -96,15 +96,15 @@
      o If you want to be informed about new code releases, bug fixes,
        security fixes, general news and information about the Apache server
        subscribe to the apache-announce mailing list as described under
-       <http://httpd.apache.org/lists.html#http-announce>
+       <https://httpd.apache.org/lists.html#http-announce>
 
      o If you want freely available support for running Apache please see the
-       resources at <http://httpd.apache.org/support.html>
+       resources at <https://httpd.apache.org/support.html>
 
      o If you have a concrete bug report for Apache please see the instructions
-       for bug reporting at <http://httpd.apache.org/bug_report.html>
+       for bug reporting at <https://httpd.apache.org/bug_report.html>
 
      o If you want to participate in actively developing Apache please
        subscribe to the `dev@httpd.apache.org' mailing list as described at
-       <http://httpd.apache.org/lists.html#http-dev>
+       <https://httpd.apache.org/lists.html#http-dev>
 
diff --git a/README.CHANGES b/README.CHANGES
new file mode 100644
index 0000000..26f8c26
--- /dev/null
+++ b/README.CHANGES
@@ -0,0 +1,19 @@
+Changes can be documented in two ways now: Either by directly editing the
+CHANGES file like it was done until now or by storing each entry for the
+CHANGES file correctly formated in a separate file in the changes-entries
+directory.
+
+The benefit of the single file per change approach is that it eases backporting
+the CHANGES entry to a stable branch as it avoids the frequent merge conflicts
+as changes are merged in different orders or not at all in the stable branch.
+
+In order to keep the current CHANGES file for the users as is there is a new
+make target called 'update-changes'. It merges all change files in the
+changes-entries directory to the top of the CHANGES file and removes them
+afterwards.
+
+This make target can be seen in a similar way as the scripts to update the
+documentation files from its xml sources. It can be executed immediately
+after the new file in the changes-entries directory has been created / merged
+and committed or it can be executed later. It should be executed at least before
+a release gets tagged.
diff --git a/README.cmake b/README.cmake
index 60fcc42..f262c14 100644
--- a/README.cmake
+++ b/README.cmake
@@ -148,7 +148,7 @@ How to build
        included if it is present.
 
      -DNGHTTP2_INCLUDE_DIR=d:/path/to/nghttp2inst/include  (which has nghttp2/*.h)
-     -DNGHTTP2_LIBRARIES=d:/path/to/nghttp2inst/lib/nghttp2.lib"
+     -DNGHTTP2_LIBRARIES="d:/path/to/nghttp2inst/lib/nghttp2.lib"
 
        These will have to be specified if nghttp2 was installed to a different
        directory than httpd.