httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject cvs commit: apache-1.3/src/main http_protocol.c
Date Mon, 12 Aug 2002 19:19:04 GMT
coar        2002/08/12 12:19:03

  Modified:    src      CHANGES
               src/main http_protocol.c
  Log:
  	Add a new environment variable to keep the charset from being
  	included on canned error documents.  (Having it there make
  	some browsers apply it to the redirect target document.)
  
  Reviewed by:	Bill Stoddard, Jim Jagielski, Justin Erenkrantz, Cliff Woolley
  
  Revision  Changes    Path
  1.1841    +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1840
  retrieving revision 1.1841
  diff -u -u -r1.1840 -r1.1841
  --- CHANGES	30 Jul 2002 13:08:04 -0000	1.1840
  +++ CHANGES	12 Aug 2002 19:19:01 -0000	1.1841
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.27
   
  +  *) Add new "suppress-error-charset" environment variable to
  +     allow a BrowserMatch workaround for clients that incorrectly
  +     use the charset of a redirect as the charset of the target.
  +     [Ken Coar]
  +
     *) Support Caldera OpenUNIX 8.  [Larry Rosenman <ler@lerctr.org>]
   
     *) Use SysV semaphores by default on OpenBSD. [Henning Brauer 
  
  
  
  1.326     +7 -1      apache-1.3/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
  retrieving revision 1.325
  retrieving revision 1.326
  diff -u -u -r1.325 -r1.326
  --- http_protocol.c	9 Jul 2002 15:26:26 -0000	1.325
  +++ http_protocol.c	12 Aug 2002 19:19:03 -0000	1.326
  @@ -2834,7 +2834,13 @@
           r->content_languages = NULL;
           r->content_encoding = NULL;
           r->clength = 0;
  -        r->content_type = "text/html; charset=iso-8859-1";
  +        if (ap_table_get(r->subprocess_env,
  +                         "suppress-error-charset") != NULL) {
  +            r->content_type = "text/html";
  +        }
  +        else {
  +            r->content_type = "text/html; charset=iso-8859-1";
  +        }
   
           if ((status == METHOD_NOT_ALLOWED) || (status == NOT_IMPLEMENTED))
               ap_table_setn(r->headers_out, "Allow", make_allow(r));
  
  
  

Mime
View raw message