You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2005/06/08 10:50:20 UTC
svn commit: r189560 - /httpd/httpd/trunk/modules/generators/mod_cgi.c
Author: jorton
Date: Wed Jun 8 01:50:19 2005
New Revision: 189560
URL: http://svn.apache.org/viewcvs?rev=189560&view=rev
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=189560&r1=189559&r2=189560&view=diff
==============================================================================
--- 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 @@
rv = apr_pollset_poll(data->pollset, timeout, &num, &results);
if (APR_STATUS_IS_TIMEUP(rv)) {
- return timeout == 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;