Received: by taz.hyperreal.com (8.8.4/V2.0) id IAA18883;
 Fri, 7 Mar 1997 08:42:11 -0800 (PST)
Received: by taz.hyperreal.com (8.8.4/V2.0) id IAA18877;
 Fri, 7 Mar 1997 08:42:09 -0800 (PST)
Date: Fri, 7 Mar 1997 08:42:09 -0800 (PST)
From: Roy Fielding <fielding@hyperreal.com>
Message-Id: <199703071642.IAA18877@taz.hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src CHANGES http_core.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

fielding    97/03/07 08:42:09

  Modified:    src       CHANGES http_core.c
  Log:
  Fixed problem with ErrorDocument not working for virtual hosts
  due to one of the performance changes in 1.2b7.
  
  Submitted by: Dean Gaudet
  Reviewed by: Roy Fielding, Ken Coar
  
  Revision  Changes    Path
  1.190     +3 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.189
  retrieving revision 1.190
  diff -C3 -r1.189 -r1.190
  *** CHANGES	1997/03/07 14:43:52	1.189
  --- CHANGES	1997/03/07 16:42:06	1.190
  ***************
  *** 1,5 ****
  --- 1,8 ----
    Changes with Apache 1.2b8
    
  +   *) Fixed problem with ErrorDocument not working for virtual hosts
  +      due to one of the performance changes in 1.2b7. [Dean Gaudet]
  + 
      *) Log an error message if we get a request header that is too long,
         since it may indicate a buffer overflow attack. [Marc Slemko]
    
  
  
  
  1.73      +6 -0      apache/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.c,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -C3 -r1.72 -r1.73
  *** http_core.c	1997/03/07 14:15:36	1.72
  --- http_core.c	1997/03/07 16:42:07	1.73
  ***************
  *** 120,125 ****
  --- 120,131 ----
        int i;
      
        memcpy ((char *)conf, (const char *)base, sizeof(core_dir_config));
  +     if( base->response_code_strings ) {
  + 	conf->response_code_strings = palloc(a,
  + 	    sizeof(*conf->response_code_strings) * RESPONSE_CODES );
  + 	memcpy( conf->response_code_strings, base->response_code_strings,
  + 	    sizeof(*conf->response_code_strings) * RESPONSE_CODES );
  +     }
        
        conf->d = new->d;
        conf->d_is_matchexp = new->d_is_matchexp;