diff options
| author | Ryan Bloom <rbb@apache.org> | 2001-01-02 18:12:09 +0100 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2001-01-02 18:12:09 +0100 |
| commit | db280eb3a5680bb52d36b441e69fd54137f74edb (patch) | |
| tree | 05acefe7291aa527c72400a267ff4debd65c99a8 | |
| parent | add dump_{bucket,brigade} macros (diff) | |
| download | apache2-db280eb3a5680bb52d36b441e69fd54137f74edb.tar.xz apache2-db280eb3a5680bb52d36b441e69fd54137f74edb.zip | |
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
| -rw-r--r-- | server/connection.c | 8 |
1 files changed, 3 insertions, 5 deletions
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. */ |