Get rid of a couple of buff-isms -- setting the B_EOUT flag in a couple

of places and doing ap_bread() in ap_lingering_close.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86700 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 05a6150e825ce8b60d7d857e8e9ab65f6fc74175..a75f6f2271266af02235d42e1273b4b3aa52b0b3 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -115,7 +115,6 @@ static void check_first_conn_error(const request_rec *r, const char *operation,
         ap_log_rerror(APLOG_MARK, APLOG_INFO, status, r,
                       "client stopped connection before %s completed",
                       operation);
-        ap_bsetflag(r->connection->client, B_EOUT, 1);
         r->connection->aborted = 1;
     }
 }

diff --git a/server/connection.c b/server/connection.c
index 32fa4bc409f748a6f2781c48ccf70d0f98bebd7c..33609a7350cc068f382820d530a254dc61701cb8 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -160,7 +160,6 @@ void ap_lingering_close(conn_rec *c)
      */
 
     if (c->aborted || !(c->client)) {
-       ap_bsetflag(c->client, B_EOUT, 1);
        ap_bclose(c->client);
         return;
     }
@@ -189,8 +188,8 @@ void ap_lingering_close(conn_rec *c)
     timeout = MAX_SECS_TO_LINGER * APR_USEC_PER_SEC;
     for (;;) {
         apr_setsocketopt(c->client_socket, BO_TIMEOUT, timeout);
-        rc = ap_bread(c->client, dummybuf, sizeof(dummybuf),
-                      &nbytes);
+        nbytes = sizeof(dummybuf);
+        rc = apr_recv(c->client_socket, dummybuf, &nbytes);
         if (rc != APR_SUCCESS || nbytes == 0) break;
 
         /* how much time has elapsed? */