You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@locus.apache.org on 2000/11/01 16:42:53 UTC
cvs commit: apache-2.0/src/main http_connection.c
trawick 00/11/01 07:42:52
Modified: src/main http_connection.c
Log:
Fix a buglet in the APR-ization of ap_lingering_close() -- use APR_SO_TIMEOUT
instead of BO_TIMEOUT. (We were actually setting a different socket option.)
Revision Changes Path
1.57 +3 -2 apache-2.0/src/main/http_connection.c
Index: http_connection.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- http_connection.c 2000/10/23 10:46:20 1.56
+++ http_connection.c 2000/11/01 15:42:50 1.57
@@ -185,7 +185,8 @@
* to the peer.
*/
- if (apr_shutdown(c->client_socket, 1) != APR_SUCCESS || c->aborted) {
+ if (apr_shutdown(c->client_socket, APR_SHUTDOWN_WRITE) != APR_SUCCESS ||
+ c->aborted) {
apr_close_socket(c->client_socket);
return;
}
@@ -197,7 +198,7 @@
start = apr_now();
timeout = MAX_SECS_TO_LINGER * APR_USEC_PER_SEC;
for (;;) {
- apr_setsocketopt(c->client_socket, BO_TIMEOUT, timeout);
+ apr_setsocketopt(c->client_socket, APR_SO_TIMEOUT, timeout);
nbytes = sizeof(dummybuf);
rc = apr_recv(c->client_socket, dummybuf, &nbytes);
if (rc != APR_SUCCESS || nbytes == 0) break;