diff options
author | Jim Jagielski <jim@apache.org> | 2017-11-13 13:30:53 +0000 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2017-11-13 13:30:53 +0000 |
commit | 58dc244655f341d682b7b281ee6d4c79fde0918d (patch) | |
tree | 6e65555a2296415398b4cb972215574b6117f658 | |
parent | 46d9a1d2b00d4a23534a7f89288fcb8125fa4af9 (diff) | |
download | httpd-58dc244655f341d682b7b281ee6d4c79fde0918d.tar.gz |
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1815099 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | STATUS | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -125,6 +125,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x: svn merge -c 1811744 ^/httpd/httpd/trunk . +1: elukey, icing, ylavic + *) mod_macro: fix usability of globally defined macros in .htaccess files. + PR 57525. + trunk patch: http://svn.apache.org/r1813643 + 2.4.x patch: trunk works (modulo CHANGES) + svn merge -c 1813643 ^/httpd/httpd/trunk . + +1: ylavic, icing, jim + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -219,13 +226,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: Note that r1812339 could be backported in any case, even if the above configure.in proposal does not get accepted. - *) mod_macro: fix usability of globally defined macros in .htaccess files. - PR 57525. - trunk patch: http://svn.apache.org/r1813643 - 2.4.x patch: trunk works (modulo CHANGES) - svn merge -c 1813643 ^/httpd/httpd/trunk . - +1: ylavic, icing, jim - *) mpm_event: avoid a very unlikely race condition between the listener and the workers when the latter fails to add a connection to the pollset. trunk patch: http://svn.apache.org/r1809273 |