httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_core.c
Date Thu, 07 Sep 2000 23:51:37 GMT
trawick     00/09/07 16:51:37

  Modified:    src      CHANGES
               src/main http_core.c
  Log:
  Fix merging of AddDefaultCharset directive.
  PR:		5872 (reported against 1.3)
  Submitted by:	Jun Kuriyama <kuriyama@imgsrc.co.jp>
  Reviewed by:	Jeff Trawick
  
  Revision  Changes    Path
  1.215     +3 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.214
  retrieving revision 1.215
  diff -u -r1.214 -r1.215
  --- CHANGES	2000/08/23 23:28:44	1.214
  +++ CHANGES	2000/09/07 23:51:33	1.215
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0a7
   
  +  *) Fix merging of AddDefaultCharset directive.
  +     PR #5872 (1.3) [Jun Kuriyama <kuriyama@imgsrc.co.jp>]
  +
     *) Minor revamp of the rlimit sections of code. We now test
        explicitly for setrlimit and getrlimit. Also, unixd_set_rlimit()
        is now "available" even if the platform doesn't support
  
  
  
  1.112     +3 -4      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- http_core.c	2000/08/30 01:09:02	1.111
  +++ http_core.c	2000/09/07 23:51:36	1.112
  @@ -321,10 +321,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