httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@locus.apache.org
Subject cvs commit: apache-1.3/src/main http_core.c
Date Fri, 08 Sep 2000 15:57:13 GMT
jim         00/09/08 08:57:12

  Modified:    src      CHANGES
               src/main http_core.c
  Log:
  Fix merging of AddDefaultCharset directive.
  PR: 5872
  Submitted by:	Jun Kuriyama <kuriyama@imgsrc.co.jp>
  Reviewed by:	Jeff Trawick, Jim Jagielski
  
  Revision  Changes    Path
  1.1571    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1570
  retrieving revision 1.1571
  diff -u -r1.1570 -r1.1571
  --- CHANGES	2000/08/31 16:37:34	1.1570
  +++ CHANGES	2000/09/08 15:57:06	1.1571
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.13
   
  +  *) Fix merging of AddDefaultCharset directive.
  +     PR #5872 [Jun Kuriyama <kuriyama@imgsrc.co.jp>]
  +    
     *) Win32: Work around bug in Win32 select on network reads. Select
        can indicate a socket has data to read, but the subsequent read
        can return WSAEWOULDBLOCK. This problem has been observed
  
  
  
  1.283     +3 -4      apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.282
  retrieving revision 1.283
  diff -u -r1.282 -r1.283
  --- http_core.c	2000/02/28 13:42:24	1.282
  +++ http_core.c	2000/09/08 15:57:10	1.283
  @@ -286,10 +286,9 @@
   
       if (new->add_default_charset != ADD_DEFAULT_CHARSET_UNSET) {
   	conf->add_default_charset = new->add_default_charset;
  -    }
  -
  -    if (new->add_default_charset_name) {
  -	conf->add_default_charset_name = new->add_default_charset_name;
  +	if (new->add_default_charset_name) {
  +	    conf->add_default_charset_name = new->add_default_charset_name;
  +	}
       }
   
       return (void*)conf;
  
  
  

Mime
View raw message