akosut 96/06/28 12:28:02
Modified: src http_config.c Log: Make KeepAlive and KeepAliveTimeout in virtualhosts use the values from the main server, unless specifically overrided. Reviewed by: Rob Hartill, Ben Laurie Revision Changes Path 1.12 +8 -2 apache/src/http_config.c Index: http_config.c =================================================================== RCS file: /export/home/cvs/apache/src/http_config.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C3 -r1.11 -r1.12 *** http_config.c 1996/06/07 17:39:23 1.11 --- http_config.c 1996/06/28 19:28:00 1.12 *************** *** 652,659 **** s->srm_confname = NULL; s->access_confname = NULL; s->timeout = 0; ! s->keep_alive_timeout = DEFAULT_KEEPALIVE_TIMEOUT; ! s->keep_alive = DEFAULT_KEEPALIVE; s->host_addr.s_addr = get_virthost_addr (hostname, &s->host_port); s->port = s->host_port; /* set them the same, by default */ s->next = NULL; --- 652,659 ---- s->srm_confname = NULL; s->access_confname = NULL; s->timeout = 0; ! s->keep_alive_timeout = 0; ! s->keep_alive = 0; s->host_addr.s_addr = get_virthost_addr (hostname, &s->host_port); s->port = s->host_port; /* set them the same, by default */ s->next = NULL; *************** *** 699,704 **** --- 699,710 ---- if (virt->timeout == 0) virt->timeout = main_server->timeout; + + if (virt->keep_alive_timeout == 0) + virt->keep_alive_timeout = main_server->keep_alive_timeout; + + if (virt->keep_alive == 0) + virt->keep_alive = main_server->keep_alive; } }