chuck 96/09/25 13:07:54
Modified: src http_main.c
Log:
Submitted by: Chuck Murcko
Remove nokeepalive environment variable checks. Really.
Revision Changes Path
1.72 +3 -5 apache/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -C3 -r1.71 -r1.72
*** http_main.c 1996/09/24 12:21:14 1.71
--- http_main.c 1996/09/25 20:07:50 1.72
***************
*** 50,56 ****
*
*/
! /* $Id: http_main.c,v 1.71 1996/09/24 12:21:14 mjc Exp $ */
/*
* httpd.c: simple http daemon for answering WWW file requests
--- 50,56 ----
*
*/
! /* $Id: http_main.c,v 1.72 1996/09/25 20:07:50 chuck Exp $ */
/*
* httpd.c: simple http daemon for answering WWW file requests
***************
*** 1530,1537 ****
#if defined(STATUS)
if (r) increment_counts(child_num,r,1);
#endif
! while (r && current_conn->keepalive &&
! !table_get(r->subprocess_env, "nokeepalive")) {
bflush(conn_io);
destroy_pool(r->pool);
(void)update_child_status (child_num, SERVER_BUSY_KEEPALIVE,
--- 1530,1536 ----
#if defined(STATUS)
if (r) increment_counts(child_num,r,1);
#endif
! while (r && current_conn->keepalive) {
bflush(conn_io);
destroy_pool(r->pool);
(void)update_child_status (child_num, SERVER_BUSY_KEEPALIVE,
***************
*** 1999,2006 ****
r = read_request (conn);
if (r) process_request (r); /* else premature EOF (ignore) */
! while (r && conn->keepalive &&
! !table_get(r->subprocess_env, "nokeepalive")) {
bflush(cio);
destroy_pool(r->pool);
r = read_request (conn);
--- 1998,2004 ----
r = read_request (conn);
if (r) process_request (r); /* else premature EOF (ignore) */
! while (r && conn->keepalive) {
bflush(cio);
destroy_pool(r->pool);
r = read_request (conn);