fielding 97/05/15 16:39:22
Modified: src CHANGES http_config.c Log: Inherit virtual server port from main server if none (or "*") is given for VirtualHost. Submitted by: Dean Gaudet Reviewed by: Roy Fielding, Paul Sutton Revision Changes Path 1.276 +3 -0 apache/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.275 retrieving revision 1.276 diff -C3 -r1.275 -r1.276 *** CHANGES 1997/05/14 19:22:50 1.275 --- CHANGES 1997/05/15 23:39:19 1.276 *************** *** 1,5 **** --- 1,8 ---- Changes with Apache 1.2 + *) Inherit virtual server port from main server if none (or "*") is + given for VirtualHost. [Dean Gaudet] + *) If the lookup for a DirectoryIndex name with content negotiation has found matching variants, but none are acceptable, return the negotiation result if there are no more DirectoryIndex names to lookup. 1.49 +6 -1 apache/src/http_config.c Index: http_config.c =================================================================== RCS file: /export/home/cvs/apache/src/http_config.c,v retrieving revision 1.48 retrieving revision 1.49 diff -C3 -r1.48 -r1.49 *** http_config.c 1997/04/12 04:24:56 1.48 --- http_config.c 1997/05/15 23:39:20 1.49 *************** *** 957,963 **** /* terminate the list */ *addrs = NULL; if( s->addrs ) { ! s->port = s->addrs->host_port; /* set them the same, by default */ } s->next = NULL; --- 957,968 ---- /* terminate the list */ *addrs = NULL; if( s->addrs ) { ! if (s->addrs->host_port) { ! s->port = s->addrs->host_port; /* set them the same, by default */ ! } else { ! /* otherwise we get a port of 0 on redirects */ ! s->port = main_server->port; ! } } s->next = NULL;