]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
lowering log level for common client connection issues
authorStefan Eissing <icing@apache.org>
Mon, 26 Oct 2015 12:19:52 +0000 (12:19 +0000)
committerStefan Eissing <icing@apache.org>
Mon, 26 Oct 2015 12:19:52 +0000 (12:19 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1710584 13f79535-47bb-0310-9956-ffa450edef68

modules/http2/h2_conn.c

index 00decc723c290b2bfba21c3afcfdf7d3bfd58610..4cd29c9b38eb2d82f34e7d9e02bb2cccf85e77e7 100644 (file)
@@ -293,21 +293,24 @@ apr_status_t h2_session_process(h2_session *session)
                 break;
             case APR_EAGAIN:              /* non-blocking read, nothing there */
                 break;
-            case APR_EBADF:               /* connection is not there any more */
-            case APR_EOF:
-            case APR_ECONNABORTED:
-            case APR_ECONNRESET:
-            case APR_TIMEUP:                       /* blocked read, timed out */
-                ap_log_cerror( APLOG_MARK, APLOG_DEBUG, status, session->c,
-                              "h2_session(%ld): reading",
-                              session->id);
-                h2_session_abort(session, status, 0);
-                break;
             default:
-                ap_log_cerror( APLOG_MARK, APLOG_INFO, status, session->c,
-                              APLOGNO(02950) 
-                              "h2_session(%ld): error reading, terminating",
-                              session->id);
+                if (APR_STATUS_IS_ETIMEDOUT(status)
+                    || APR_STATUS_IS_ECONNABORTED(status)
+                    || APR_STATUS_IS_ECONNRESET(status)
+                    || APR_STATUS_IS_EOF(status)
+                    || APR_STATUS_IS_EBADF(status)) {
+                    /* common status for a client that has left */
+                    ap_log_cerror( APLOG_MARK, APLOG_DEBUG, status, session->c,
+                                  "h2_session(%ld): terminating",
+                                  session->id);
+                }
+                else {
+                    /* uncommon status, log on INFO so that we see this */
+                    ap_log_cerror( APLOG_MARK, APLOG_INFO, status, session->c,
+                                  APLOGNO(02950) 
+                                  "h2_session(%ld): error reading, terminating",
+                                  session->id);
+                }
                 h2_session_abort(session, status, 0);
                 break;
         }