From: William A. Rowe Jr Date: Tue, 8 May 2007 17:26:45 +0000 (+0000) Subject: Done; condense, vote and promote. X-Git-Tag: 2.2.5~252 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26f6683c32dcde6a8ec2b17dee17d3d6cb11524d;p=thirdparty%2Fapache%2Fhttpd.git Done; condense, vote and promote. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536263 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 4b93acc8fa0..c3feeba4b59 100644 --- a/STATUS +++ b/STATUS @@ -98,18 +98,15 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: +1: niq, jim, wrowe -PATCHES PROPOSED TO BACKPORT FROM TRUNK: - * mod_proxy_ajp: Fix wrong retry when sending the response failed. PR 40310 (The old fixes weren't ok). Trunk version of patch: http://svn.apache.org/viewvc?view=rev&revision=518938 http://svn.apache.org/viewvc?view=rev&revision=534031 (It also works for httpd-2.2.x). - +1: jfclere - rpluem says: If you add - http://svn.apache.org/viewvc?view=rev&revision=534031 - I am +1. + +1: jfclere, rpluem, wrowe + +PATCHES PROPOSED TO BACKPORT FROM TRUNK: * mpm_winnt: Fix return values from wait_for_many_objects. Note - this is required to avoid hangups of socket #64, #128