svn commit: r1725557 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID modules/fcgid/fcgid_bridge.c

[co...@apache.org]

Author: covener
Date: Tue Jan 19 16:13:02 2016
New Revision: 1725557

URL: http://svn.apache.org/viewvc?rev=1725557&view=rev
Log:
A user on IRC had APR_EPIPE in this path and lots of WARN spam
in logs. Check r->c->aborted to determine if an warning is worth
surfacing (although for a downstream filter error, is it ever?)


Modified:
    httpd/mod_fcgid/trunk/CHANGES-FCGID
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c

Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=1725557&r1=1725556&r2=1725557&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
+++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Tue Jan 19 16:13:02 2016
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with mod_fcgid 2.3.10
 
+  *) Use an alternate, lower severity log message when a failure to
+     forward a response is due to the client connection being aborted.
+     [Eric Covener]
+
   *) Windows: "graceful kill fail, sending SIGKILL" log message is now
      debug level instead of warning.  PR 54597.  [Mario Brandt]
 

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=1725557&r1=1725556&r2=1725557&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c Tue Jan 19 16:13:02 2016
@@ -403,11 +403,15 @@ handle_request_ipc(request_rec *r, int r
     /* Now pass any remaining response body data to output filters */
     if ((rv = ap_pass_brigade(r->output_filters,
                               brigade_stdout)) != APR_SUCCESS) {
-        if (!APR_STATUS_IS_ECONNABORTED(rv)) {
-            ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
-                          "mod_fcgid: ap_pass_brigade failed in "
-                          "handle_request_ipc function");
-        }
+        if (r->connection->aborted) {
+            ap_log_rerror(APLOG_MARK, APLOG_TRACE1, rv, r,
+                      "mod_fcgid: ap_pass_brigade failed "
+                      "(client aborted connection)");
+            return OK;
+        } 
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
+                      "mod_fcgid: ap_pass_brigade failed in "
+                      "handle_request_ipc function");
 
         return HTTP_INTERNAL_SERVER_ERROR;
     }