jim 96/07/10 06:50:44
Modified: src README http_main.c
Log:
Make lingering close default
Revision Changes Path
1.9 +3 -0 apache/src/README
Index: README
===================================================================
RCS file: /export/home/cvs/apache/src/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -C3 -r1.8 -r1.9
*** README 1996/07/09 21:40:12 1.8
--- README 1996/07/10 13:50:41 1.9
***************
*** 213,218 ****
--- 213,221 ----
NO_SETSID:
NO_USE_SIGACTION:
Do not use the sigaction() call, even if we have it.
+ NO_LINGCLOSE:
+ Do not use Apache's soft, "lingering" close feature to
+ terminate connections.
--
MISC #DEFINES:
1.46 +6 -6 apache/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C3 -r1.45 -r1.46
*** http_main.c 1996/07/09 21:44:57 1.45
--- http_main.c 1996/07/10 13:50:42 1.46
***************
*** 274,284 ****
/*
* More machine-dependant networking gooo... on some systems,
* you've got to be *really* sure that all the packets are acknowledged
! * before closing the connection. Actually, it shouldn't hurt anyplace,
! * but this is a late bugfix, so be conservative...
*/
! #ifdef NEED_LINGER
static void lingering_close (int sd, server_rec *server_conf)
{
int dummybuf[512];
--- 274,283 ----
/*
* More machine-dependant networking gooo... on some systems,
* you've got to be *really* sure that all the packets are acknowledged
! * before closing the connection.
*/
! #ifndef NO_LINGCLOSE
static void lingering_close (int sd, server_rec *server_conf)
{
int dummybuf[512];
***************
*** 1322,1334 ****
bytes_in_pool (ptrans), r->the_request);
#endif
bflush(conn_io);
! #ifdef NEED_LINGER
if (r)
lingering_close (conn_io->fd, r->server);
else
close (conn_io->fd);
- #else
- bclose(conn_io);
#endif
}
}
--- 1321,1334 ----
bytes_in_pool (ptrans), r->the_request);
#endif
bflush(conn_io);
!
! #ifdef NO_LINGCLOSE
! bclose(conn_io); /* slam it shut */
! #else
if (r)
lingering_close (conn_io->fd, r->server);
else
close (conn_io->fd);
#endif
}
}
