You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2017/11/08 23:41:23 UTC

svn commit: r1814659 - /httpd/httpd/trunk/modules/http/http_core.c

Author: ylavic
Date: Wed Nov  8 23:41:23 2017
New Revision: 1814659

URL: http://svn.apache.org/viewvc?rev=1814659&view=rev
Log:
We can't possibly loop in ap_process_http_async_connection().

While at it, fix style. No functional change overall.


Modified:
    httpd/httpd/trunk/modules/http/http_core.c

Modified: httpd/httpd/trunk/modules/http/http_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_core.c?rev=1814659&r1=1814658&r2=1814659&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_core.c (original)
+++ httpd/httpd/trunk/modules/http/http_core.c Wed Nov  8 23:41:23 2017
@@ -140,11 +140,12 @@ static int ap_process_http_async_connect
     AP_DEBUG_ASSERT(cs != NULL);
     AP_DEBUG_ASSERT(cs->state == CONN_STATE_READ_REQUEST_LINE);
 
-    while (cs->state == CONN_STATE_READ_REQUEST_LINE) {
+    if (cs->state == CONN_STATE_READ_REQUEST_LINE) {
         ap_update_child_status_from_conn(c->sbh, SERVER_BUSY_READ, c);
-        if (ap_extended_status) ap_set_conn_count(c->sbh, r, c->keepalives);
+        if (ap_extended_status) {
+            ap_set_conn_count(c->sbh, r, c->keepalives);
+        }
         if ((r = ap_read_request(c))) {
-
             c->keepalive = AP_CONN_UNKNOWN;
             /* process the request if it was read without error */