--- modules/generators/mod_cgi.c.cgitimeout	2005-02-04 20:21:18.000000000 +0000
+++ modules/generators/mod_cgi.c	2005-03-24 09:22:58.092812354 +0000
@@ -674,7 +674,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 CGI script %s",
+                              data->r->filename);
+                return rv;
+            }
+            else {
+                return APR_EAGAIN;
+            }
         }
         else if (APR_STATUS_IS_EINTR(rv)) {
             continue;