Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 7177 invoked from network); 8 Jun 2005 08:57:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Jun 2005 08:57:29 -0000 Received: (qmail 84812 invoked by uid 500); 8 Jun 2005 08:57:27 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 84769 invoked by uid 500); 8 Jun 2005 08:57:27 -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 84756 invoked by uid 99); 8 Jun 2005 08:57:27 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 08 Jun 2005 01:57:26 -0700 Received: (qmail 3922 invoked by uid 65534); 8 Jun 2005 08:50:20 -0000 Message-ID: <20050608085020.3921.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r189560 - /httpd/httpd/trunk/modules/generators/mod_cgi.c Date: Wed, 08 Jun 2005 08:50:20 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jorton Date: Wed Jun 8 01:50:19 2005 New Revision: 189560 URL: http://svn.apache.org/viewcvs?rev=3D189560&view=3Drev Log: * modules/generators/mod_cgi.c (cgi_bucket_read): Log a specific error if a timeout occurs from a blocking read; more helpful than a generic "apr_bucket_read failed" error from some higher-up filter. Modified: httpd/httpd/trunk/modules/generators/mod_cgi.c Modified: httpd/httpd/trunk/modules/generators/mod_cgi.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/generators/mod= _cgi.c?rev=3D189560&r1=3D189559&r2=3D189560&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- httpd/httpd/trunk/modules/generators/mod_cgi.c (original) +++ httpd/httpd/trunk/modules/generators/mod_cgi.c Wed Jun 8 01:50:19 2005 @@ -678,7 +678,15 @@ =20 rv =3D apr_pollset_poll(data->pollset, timeout, &num, &results); if (APR_STATUS_IS_TIMEUP(rv)) { - return timeout =3D=3D 0 ? APR_EAGAIN : rv; + if (timeout) { + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, data->r, + "Timeout waiting for output from CGI script = %s", + data->r->filename); + return rv; + } + else { + return APR_EAGAIN; + } } else if (APR_STATUS_IS_EINTR(rv)) { continue;