dgaudet 97/03/18 19:09:26
Modified: src CHANGES http_protocol.c
Log:
per_dir_defaults weren't set correctly until directory_walk for
name-based vhosts. This fixes an obscure bug with the wrong config
info being used for vhosts that share the same ip as the server.
Reviewed by: Roy, Ralf, Randy
Revision Changes Path
1.203 +5 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.202
retrieving revision 1.203
diff -C3 -r1.202 -r1.203
*** CHANGES 1997/03/18 10:23:52 1.202
--- CHANGES 1997/03/19 03:09:24 1.203
***************
*** 1,5 ****
--- 1,10 ----
Changes with Apache 1.2b8
+ *) per_dir_defaults weren't set correctly until directory_walk for
+ name-based vhosts. This fixes an obscure bug with the wrong config
+ info being used for vhosts that share the same ip as the server.
+ [Dean Gaudet]
+
*) Improved generation of modules/Makefile to be more generic for
new module directories. [Ken Coar and Chuck Murcko]
1.108 +3 -0 apache/src/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -C3 -r1.107 -r1.108
*** http_protocol.c 1997/03/07 14:43:52 1.107
--- http_protocol.c 1997/03/19 03:09:24 1.108
***************
*** 756,761 ****
--- 756,764 ----
check_hostalias(r);
else
check_serverpath(r);
+
+ /* we may have switched to another server */
+ r->per_dir_config = r->server->lookup_defaults;
kill_timeout (r);
conn->keptalive = 0; /* We now have a request - so no more short
timeouts */
