Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 52968 invoked from network); 29 Nov 2006 09:05:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Nov 2006 09:05:21 -0000 Received: (qmail 82344 invoked by uid 500); 29 Nov 2006 09:05:26 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 82232 invoked by uid 500); 29 Nov 2006 09:05:26 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 82221 invoked by uid 99); 29 Nov 2006 09:05:26 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Nov 2006 01:05:26 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: domain of jfclere@gmail.com designates 64.233.184.238 as permitted sender) Received: from [64.233.184.238] (HELO wr-out-0506.google.com) (64.233.184.238) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Nov 2006 01:05:13 -0800 Received: by wr-out-0506.google.com with SMTP id i32so516893wra for ; Wed, 29 Nov 2006 01:04:52 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:subject:from:to:in-reply-to:references:content-type:date:message-id:mime-version:x-mailer:content-transfer-encoding; b=treCRg2PfW99mg9W9m9qq7CdlO8U4HVso9bacYo/WUYPeaYpJTFu9zId9t+xrxNXFosU7T2y9BS0CK2tP3K//Z8mzheNYCuB1fZBpkFDlkQBTyZzgesjgmoUtvSGR4MrbBrInBjoWStRZs6BPNIlB9XOEl2hxDMyqdl/cNCaKkw= Received: by 10.90.93.6 with SMTP id q6mr1936364agb.1164791092448; Wed, 29 Nov 2006 01:04:52 -0800 (PST) Received: from ?192.168.4.43? ( [212.249.12.130]) by mx.google.com with ESMTP id 11sm16278669wrl.2006.11.29.01.04.50; Wed, 29 Nov 2006 01:04:51 -0800 (PST) Subject: Re: svn commit: r480193 - /httpd/httpd/trunk/modules/http/http_filters.c From: Jean-Frederic To: dev@httpd.apache.org In-Reply-To: <20061128203649.7BE231A9846@eris.apache.org> References: <20061128203649.7BE231A9846@eris.apache.org> Content-Type: text/plain Date: Wed, 29 Nov 2006 10:05:03 +0100 Message-Id: <1164791103.2865.25.camel@jfcpc> Mime-Version: 1.0 X-Mailer: Evolution 2.8.1.1 (2.8.1.1-3.fc6) Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org Thanks Cheers Jean-Frederic On Tue, 2006-11-28 at 20:36 +0000, jim@apache.org wrote: > Author: jim > Date: Tue Nov 28 12:36:47 2006 > New Revision: 480193 > > URL: http://svn.apache.org/viewvc?view=rev&rev=480193 > Log: > Protect against any sort of non-block read that > would block. If ap_get_brigade() shows that, return > EAGAIN. > > Modified: > httpd/httpd/trunk/modules/http/http_filters.c > > Modified: httpd/httpd/trunk/modules/http/http_filters.c > URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?view=diff&rev=480193&r1=480192&r2=480193 > ============================================================================== > --- httpd/httpd/trunk/modules/http/http_filters.c (original) > +++ httpd/httpd/trunk/modules/http/http_filters.c Tue Nov 28 12:36:47 2006 > @@ -216,7 +216,8 @@ > > /* for timeout */ > if (block == APR_NONBLOCK_READ && > - rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)) { > + ( (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)) || > + (APR_STATUS_IS_EAGAIN(rv)) )) { > return APR_EAGAIN; > } > > @@ -304,7 +305,8 @@ > block, 0); > /* Test timeout */ > if (block == APR_NONBLOCK_READ && > - rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)) { > + ( (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)) || > + (APR_STATUS_IS_EAGAIN(rv)) )) { > ctx->state = BODY_CHUNK_PART; > return APR_EAGAIN; > } > >