httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject cvs commit: apache-1.3/src/main http_vhost.c
Date Sat, 17 Feb 2001 14:24:00 GMT
martin      01/02/17 06:24:00

  Modified:    .        STATUS
               src/main http_vhost.c
  Log:
  This patch works around dereferencing a zero server pointer.
  The assumption is that these come from a misconfiguration, and don't
  hurt the running server (because the vhost resolution works in the
  opposite direction, from server to vhost). It only hurts in the "-S"
  command, and that can be avoided by printing a WARNING about the
  misconfiguration.
  
  Revision  Changes    Path
  1.922     +6 -6      apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.921
  retrieving revision 1.922
  diff -u -u -r1.921 -r1.922
  --- STATUS	2001/02/17 14:18:21	1.921
  +++ STATUS	2001/02/17 14:23:58	1.922
  @@ -1,5 +1,5 @@
     1.3 STATUS:
  -  Last modified at [$Date: 2001/02/17 14:18:21 $]
  +  Last modified at [$Date: 2001/02/17 14:23:58 $]
   
   Release:
   
  @@ -36,11 +36,6 @@
   
   RELEASE SHOWSTOPPERS:
   
  -    * Martin observed a core dump because a ipaddr_chain struct contains
  -      a NULL-"server" pointer when being dereferenced by invoking "httpd -S".
  -      See Message-ID: <20010213231854.A20932@deejai2.mch.fsc.net>
  -      Status: Others attempting to duplicate
  -
       * Segfault potential when forming a URI string from a
         uri_components structure, if the structure lacks a scheme.
         There are 3 proposed patches, one of which must be folded
  @@ -53,6 +48,11 @@
                  Fix#3 (ap_unparse_uri_components): Martin +0 (after 1.3.18?)
   
   RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
  +
  +    * Martin observed a core dump because a ipaddr_chain struct contains
  +      a NULL-"server" pointer when being dereferenced by invoking "httpd -S".
  +      See Message-ID: <20010213231854.A20932@deejai2.mch.fsc.net>
  +      Status: Workaround enabled. Clean solution can come after 1.3.18
   
       * long pathnames with many components and no AllowOverride None
         Workaround is to define <Directory /> with AllowOverride None,
  
  
  
  1.27      +4 -1      apache-1.3/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_vhost.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -u -r1.26 -r1.27
  --- http_vhost.c	2001/02/17 11:17:45	1.26
  +++ http_vhost.c	2001/02/17 14:24:00	1.27
  @@ -432,7 +432,10 @@
   	buf[len-1] = '*';
       }
       if (ic->names == NULL) {
  -	fprintf(f, "%-22s %s (%s:%u)\n", buf, ic->server->server_hostname,
  +	if (ic->server == NULL)
  +	    fprintf(f, "%-22s WARNING: No <VirtualHost> defined for this NameVirtualHost!\n",
buf);
  +	else
  +	    fprintf(f, "%-22s %s (%s:%u)\n", buf, ic->server->server_hostname,
   		ic->server->defn_name, ic->server->defn_line_number);
   	return;
       }
  
  
  

Mime
View raw message