Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 35889 invoked from network); 10 Aug 2007 11:10:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Aug 2007 11:10:56 -0000 Received: (qmail 29726 invoked by uid 500); 10 Aug 2007 11:10:54 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 29673 invoked by uid 500); 10 Aug 2007 11:10:54 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 29661 invoked by uid 99); 10 Aug 2007 11:10:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2007 04:10:53 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2007 11:10:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 984C01A981A; Fri, 10 Aug 2007 04:10:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r564550 - /httpd/httpd/branches/2.2.x/STATUS Date: Fri, 10 Aug 2007 11:10:32 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070810111032.984C01A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Fri Aug 10 04:10:31 2007 New Revision: 564550 URL: http://svn.apache.org/viewvc?view=rev&rev=564550 Log: Promote approved patches Modified: httpd/httpd/branches/2.2.x/STATUS Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=564550&r1=564549&r2=564550 ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Fri Aug 10 04:10:31 2007 @@ -78,9 +78,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - -PATCHES PROPOSED TO BACKPORT FROM TRUNK: - * ApacheMonitor: Fix Windows Vista detection. http://svn.apache.org/viewvc?view=rev&revision=536052 http://svn.apache.org/viewvc?view=rev&revision=556879 @@ -94,6 +91,17 @@ svn diff -r536051:557188 \ http://svn.apache.org/repos/asf/httpd/httpd/trunk/support/win32/ApacheMonitor.c + * mod_proxy_ajp: Add support of ProxyIOBufferSize. + Trunk version of patch: + http://svn.apache.org/viewvc?view=rev&rev=467014 + http://svn.apache.org/viewvc?view=rev&revision=467257 + http://svn.apache.org/viewvc?view=rev&revision=510522 + 2.2.x version of patch: + http://people.apache.org/~jim/patches/ProxyIOBufferSize.2.patch + +1: jim, mturk, fuankg + +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 as Microsoft set aside 64 reserved values. @@ -238,15 +246,6 @@ apr_brigade_cleanup inside of ap_proxygetline then. Furthermore the check for a buffer overflow a few lines later is not correct any more (now an error (APR_ENOSPC) is returned instead). - - * mod_proxy_ajp: Add support of ProxyIOBufferSize. - Trunk version of patch: - http://svn.apache.org/viewvc?view=rev&rev=467014 - http://svn.apache.org/viewvc?view=rev&revision=467257 - http://svn.apache.org/viewvc?view=rev&revision=510522 - 2.2.x version of patch: - http://people.apache.org/~jim/patches/ProxyIOBufferSize.2.patch - +1: jim, mturk, fuankg * multiple files, Trivial cleanups PR: 39518 - Christophe JAILLET