From: Ryan Bloom <rbb@apache.org>
Date: Tue, 2 Jan 2001 17:12:09 +0000 (+0000)
Subject: Simplify the lingering close logic a bit.  Doesn't actually change
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db280eb3a5680bb52d36b441e69fd54137f74edb;p=apache

Simplify the lingering close logic a bit.  Doesn't actually change
anything, this just removes a duplicate call to ap_flush_conn.


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

diff --git a/server/connection.c b/server/connection.c
index 8f27f67e8d..940496d454 100644
--- a/server/connection.c
+++ b/server/connection.c
@@ -171,16 +171,14 @@ void ap_lingering_close(conn_rec *c)
      * client has ACKed our FIN and/or has stopped sending us data.
      */
 
+    /* Send any leftover data to the client, but never try to again */
+    ap_flush_conn(c);
+
     if (c->aborted) {
-        ap_flush_conn(c);
         apr_close_socket(c->client_socket);
         return;
     }
 
-    /* Send any leftover data to the client, but never try to again */
-
-    ap_flush_conn(c);
-
     /* Shut down the socket for write, which will send a FIN
      * to the peer.
      */