svn commit: r826760 - in /httpd/mod_fcgid/trunk/modules/fcgid: fcgid_bridge.c fcgid_proc_unix.c

[tr...@apache.org]

Author: trawick
Date: Mon Oct 19 19:01:41 2009
New Revision: 826760

URL: http://svn.apache.org/viewvc?rev=826760&view=rev
Log:
axe the extra "mod_fcgid: error writing data to FastCGI server"
error message for proc_write_ipc() failures

(this sometimes had a made-up error code, which didn't help either)

one edge case wasn't already covered by a log message, apr_bucket_read()
failures on Unix, so copy the logging of that failure from the Windows
path

Modified:
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c?rev=826760&r1=826759&r2=826760&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c Mon Oct 19 19:01:41 2009
@@ -376,8 +376,6 @@
     if ((rv =
          proc_write_ipc(&bucket_ctx->ipc,
                         output_brigade)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
-                      "mod_fcgid: error writing data to FastCGI server");
         bucket_ctx->has_error = 1;
         return HTTP_INTERNAL_SERVER_ERROR;
     }

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c?rev=826760&r1=826759&r2=826760&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_unix.c Mon Oct 19 19:01:41 2009
@@ -758,8 +758,11 @@
         apr_size_t len;
         const char* base;
         if ((rv = apr_bucket_read(e, &base, &len,
-                                  APR_BLOCK_READ)) != APR_SUCCESS)
+                                  APR_BLOCK_READ)) != APR_SUCCESS) {
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, ipc_handle->request,
+                          "mod_fcgid: can't read request from bucket");
             return rv;
+        }
 
         vec[nvec].iov_len = len;
         vec[nvec].iov_base = (char*) base;