From: Jim Jagielski Date: Tue, 8 May 2007 18:22:09 +0000 (+0000) Subject: Promote X-Git-Tag: 2.2.5~246 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=841a5d56cf3219cf49df598ac9208cb84b215733;p=thirdparty%2Fapache%2Fhttpd.git Promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536289 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index e3eab19b6d6..6919407a9ae 100644 --- a/STATUS +++ b/STATUS @@ -105,6 +105,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: (It also works for httpd-2.2.x). +1: jfclere, rpluem, wrowe + * proxy_util.c: Add alternate is_socket_connected() function + which uses APR calls. + Trunk version of patch: + http://svn.apache.org/viewvc?view=rev&rev=473278 + http://svn.apache.org/viewvc?view=rev&rev=535354 + 2.2.x version of patch: + Trunk version works + +1: rpluem, mturk, jim PATCHES PROPOSED TO BACKPORT FROM TRUNK: @@ -165,15 +173,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: non-path, special values, (e.g. '/' vs %2F the character) then I'm strongly +1. - * proxy_util.c: Add alternate is_socket_connected() function - which uses APR calls. - Trunk version of patch: - http://svn.apache.org/viewvc?view=rev&rev=473278 - http://svn.apache.org/viewvc?view=rev&rev=535354 - 2.2.x version of patch: - Trunk version works - +1: rpluem, mturk, jim - * core: Add extern "C" linkage to several headers to make it easier to use them in C++ code. PR: 42286