diff options
| author | Joe Orton <jorton@apache.org> | 2018-08-14 17:32:23 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2018-08-14 17:32:23 +0000 |
| commit | 46059c0b7cf85ed87779af651b1e62bac0b3c585 (patch) | |
| tree | f6a510abd6d6974185610b9aa06e4befe36b022e | |
| parent | 5a84f47828a29685f3f4b9b1cb453e167ed77466 (diff) | |
| download | httpd-46059c0b7cf85ed87779af651b1e62bac0b3c585.tar.gz | |
Vote+promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838039 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | STATUS | 54 |
1 files changed, 27 insertions, 27 deletions
@@ -142,6 +142,33 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: +1: jailletc36, covener, jim jailletc36: once backported, iffile.t can be enabled + *) Easy patches: synch 2.4.x and trunk + - mod_ssl: Tweak logging message + - mod_ssl: make ssl_io_data_dump respect per-conn loglevel + - mod_ssl: adjust log level + - mod_ssl: handle RAND_bytes() failures (API changed in OpenSSL 0.9.5 and httpd needs >= 0.9.8a) + - mod_ssl: fix typo + - core: Simplify code + - mod_ssl: simplify code + - core: Print the unparsed URI in AH03454 + - mod_proxy_ajp: release some resources on an error handling pah + - mod_proxy: Skip creating subpool for debugging unless debug-level logging is enabled + - mod_watchdog: Correct some log messages and fix compiler warning + trunk patch: http://svn.apache.org/r1418761 + http://svn.apache.org/r1418765 + http://svn.apache.org/r1510295 + http://svn.apache.org/r1757147 + http://svn.apache.org/r1805163 + http://svn.apache.org/r1818924 + http://svn.apache.org/r1827374 + http://svn.apache.org/r1831772 + http://svn.apache.org/r1832351 + http://svn.apache.org/r1832951 + http://svn.apache.org/r1815004 + 2.4.x patch: trunk patches work, minus CHANGES and next-number in the last commit (r1815004) + svn merge -c 1418761,1418765,1510295,1757147,1805163,1818924,1827374,1831772,1832351,1832951,1815004 ^/httpd/httpd/trunk . + +1: jailletc36, jim, jorton + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -238,33 +265,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: (adjust CHANGES and include/ap_mmn.h) +1: rjung, jim - *) Easy patches: synch 2.4.x and trunk - - mod_ssl: Tweak logging message - - mod_ssl: make ssl_io_data_dump respect per-conn loglevel - - mod_ssl: adjust log level - - mod_ssl: handle RAND_bytes() failures (API changed in OpenSSL 0.9.5 and httpd needs >= 0.9.8a) - - mod_ssl: fix typo - - core: Simplify code - - mod_ssl: simplify code - - core: Print the unparsed URI in AH03454 - - mod_proxy_ajp: release some resources on an error handling pah - - mod_proxy: Skip creating subpool for debugging unless debug-level logging is enabled - - mod_watchdog: Correct some log messages and fix compiler warning - trunk patch: http://svn.apache.org/r1418761 - http://svn.apache.org/r1418765 - http://svn.apache.org/r1510295 - http://svn.apache.org/r1757147 - http://svn.apache.org/r1805163 - http://svn.apache.org/r1818924 - http://svn.apache.org/r1827374 - http://svn.apache.org/r1831772 - http://svn.apache.org/r1832351 - http://svn.apache.org/r1832951 - http://svn.apache.org/r1815004 - 2.4.x patch: trunk patches work, minus CHANGES and next-number in the last commit (r1815004) - svn merge -c 1418761,1418765,1510295,1757147,1805163,1818924,1827374,1831772,1832351,1832951,1815004 ^/httpd/httpd/trunk . - +1: jailletc36, jim - PATCHES/ISSUES THAT ARE BEING WORKED [ New entries should be added at the START of the list ] |