From: Eric Covener Date: Sun, 5 Oct 2014 13:09:14 +0000 (+0000) Subject: vote/promote X-Git-Tag: 2.4.11~265 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ef3deb4d22943abce6787d4e494b388eb6f4bfe;p=thirdparty%2Fapache%2Fhttpd.git vote/promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1629489 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 2a2d3176370..012ea9120c9 100644 --- a/STATUS +++ b/STATUS @@ -140,6 +140,18 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: http://people.apache.org/~jim/patches/slotmem-loglevel.patch +1: jim, ylavic, rjung + * mod_proxy: Make worker name truncation a non-fatal error. + trunk patch: http://svn.apache.org/r1621367 + http://svn.apache.org/r1621372 + http://svn.apache.org/r1625952 + 2.4.x patch: http://people.apache.org/~jim/patches/worker-trunc.patch + +1: jim, ylavic, covener + + * mod_macro: Remove APLOG_NOERRNO. Add some APLOGNO. Fix some alignment. + trunk patch: http://svn.apache.org/r1612466 + 2.4.x patch: trunk works + +1: jailletc36, rjung, covener + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -190,14 +202,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works +1: jailletc36, rjung - - * mod_proxy: Make worker name truncation a non-fatal error. - trunk patch: http://svn.apache.org/r1621367 - http://svn.apache.org/r1621372 - http://svn.apache.org/r1625952 - 2.4.x patch: http://people.apache.org/~jim/patches/worker-trunc.patch - +1: jim, ylavic - * mod_systemd: New module, for integration with systemd on Linux. trunk patch: http://svn.apache.org/r1393976 http://svn.apache.org/r1393997 @@ -224,24 +228,19 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1628104 http://svn.apache.org/r1628918 (CHANGES) 2.4.x patch: trunk works - +1: rjung + +1: rjung, covener * mod_substitute: Make maximum line length configurable. trunk patch: http://svn.apache.org/r1628919 http://svn.apache.org/r1628950 (docs, adjust "compatibility") 2.4.x patch: trunk works modulo CHANGES and compatibility - +1: rjung + +1: rjung, covener * mod_substitute: Restrict configuration in .htaccess to FileInfo as documented. trunk patch: http://svn.apache.org/r1628924 2.4.x patch: trunk works modulo CHANGES - +1: rjung - - * mod_macro: Remove APLOG_NOERRNO. Add some APLOGNO. Fix some alignment. - trunk patch: http://svn.apache.org/r1612466 - 2.4.x patch: trunk works - +1: jailletc36, rjung + +1: rjung, covener * various: Concat string at compile time when possible. trunk patch: http://svn.apache.org/r1626050