From: Christophe Jaillet Date: Sun, 27 May 2018 16:54:26 +0000 (+0000) Subject: Propose some easy votes to synch 2.4.x with trunk X-Git-Tag: 2.4.34~168 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3eeba71ec8627598543e198bf8740fec48785aff;p=apache Propose some easy votes to synch 2.4.x with trunk git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832341 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 4805065348..480f437f7a 100644 --- 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 ]