]> granicus.if.org Git - apache/commitdiff
Propose some easy votes to synch 2.4.x with trunk
authorChristophe Jaillet <jailletc36@apache.org>
Sun, 27 May 2018 16:54:26 +0000 (16:54 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Sun, 27 May 2018 16:54:26 +0000 (16:54 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832341 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 48050653483f9688152ef577fe37695a604ffda3..480f437f7a631aeedf22f3c6d2ea8d7555414b5c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -327,6 +327,30 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1831231,1831591 ^/httpd/httpd/trunk .
      +1: jailletc36,
 
+  *) Easy patches: synch 2.4.x and trunk
+     - core: add a comment
+     - mod_auth_form: Silence a static checker warning
+     - unixd: fix a compilation warning
+     - mod_sed: do not compute string length twice
+     - mod_substitute: add some TRACE8 debugging messages
+     - mod_ssl: fix the error code written in a log message
+     - win32/Apachemonitor: Success of 'SHGetMalloc()' should be tested with the SUCCEEDED macro.
+     - core: Axe some dead code
+     - core: Fix typo in comment
+     - core: Fix a potential un-intialized variable usage warning.
+     trunk patch: http://svn.apache.org/r1490294
+                  http://svn.apache.org/r1734635
+                  http://svn.apache.org/r1749403
+                  http://svn.apache.org/r1813116
+                  http://svn.apache.org/r1816179
+                  http://svn.apache.org/r1817598
+                  http://svn.apache.org/r1832198 
+                  http://svn.apache.org/r1832200
+                  http://svn.apache.org/r1832277
+                  http://svn.apache.org/r1832317
+     2.4.x patch: svn merge -c 1490294,1734635,1749403,1813116,1816179,1817598,1832198,1832200,1832277,1832317 ^/httpd/httpd/trunk .
+     +1: jailletc36,
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]