From: Paul Querna Date: Fri, 21 Apr 2006 15:15:54 +0000 (+0000) Subject: Move up accepted patch. X-Git-Tag: 2.2.2~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4de786aa19fd673d79ec8e98123dc58cfcb1305;p=thirdparty%2Fapache%2Fhttpd.git Move up accepted patch. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395908 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 128ef51092e..316cf64e350 100644 --- a/STATUS +++ b/STATUS @@ -98,6 +98,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: trawick (with rev 395180) trawick: needs http://svn.apache.org/viewcvs?rev=395180&view=rev + * mod_proxy_balancer: Initialize local data structures for workers of a + balancer. PR 38227, PR 38267. + Trunk version of patch: + http://svn.apache.org/viewcvs?rev=394065&view=rev + http://svn.apache.org/viewcvs?rev=394446&view=rev + 2.2.x version of patch: + Trunk version works + +1: rpluem, jim, wrowe PATCHES PROPOSED TO BACKPORT FROM TRUNK: @@ -131,15 +139,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: jim, does your agreement with niq also include his +1 in the case the comment is fixed? - * mod_proxy_balancer: Initialize local data structures for workers of a - balancer. PR 38227, PR 38267. - Trunk version of patch: - http://svn.apache.org/viewcvs?rev=394065&view=rev - http://svn.apache.org/viewcvs?rev=394446&view=rev - 2.2.x version of patch: - Trunk version works - +1: rpluem, jim, wrowe - * arch win32: http://svn.apache.org/viewcvs?rev=395419&view=rev s|/GX |/EHsc | because they were always synonyms, and Visual Studio 2005 edition complains bitterly and loudly that /GX is deprecated.