httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/metadata mod_headers.c
Date Sat, 24 Apr 2004 11:51:07 GMT
nd          2004/04/24 04:51:07

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/metadata Tag: APACHE_2_0_BRANCH mod_headers.c
  Log:
  don't segfault, when setting an empty header value
  
  Reviewed by: Brad Nicholes, Jeff Trawick
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.270 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.269
  retrieving revision 1.988.2.270
  diff -u -u -r1.988.2.269 -r1.988.2.270
  --- CHANGES	24 Apr 2004 11:43:00 -0000	1.988.2.269
  +++ CHANGES	24 Apr 2004 11:51:06 -0000	1.988.2.270
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.50
   
  +  *) mod_headers no longer crashes if an empty header value should
  +     be added.  [André Malo]
  +
     *) Fix segfault in mod_expires, which occured under certain
        circumstances. PR 28047.  [André Malo]
   
  
  
  
  1.751.2.834 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.833
  retrieving revision 1.751.2.834
  diff -u -u -r1.751.2.833 -r1.751.2.834
  --- STATUS	24 Apr 2004 11:43:01 -0000	1.751.2.833
  +++ STATUS	24 Apr 2004 11:51:06 -0000	1.751.2.834
  @@ -93,10 +93,6 @@
            server/core.c: r1.275
          +1: nd
   
  -    *) mod_headers: don't segfault, when supplying an empty header value
  -         modules/metadata/mod_headers.c: r1.56
  -       +1: nd, bnicholes, trawick
  -
       *) mod_headers: Backport ErrorHeader directive (regression from 1.3)
            modules/metadata/mod_headers.c: r1.44, 1.45, 1.51
          +1: nd, trawick
  
  
  
  No                   revision
  No                   revision
  1.42.2.5  +1 -1      httpd-2.0/modules/metadata/mod_headers.c
  
  Index: mod_headers.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_headers.c,v
  retrieving revision 1.42.2.4
  retrieving revision 1.42.2.5
  diff -u -u -r1.42.2.4 -r1.42.2.5
  --- mod_headers.c	9 Feb 2004 20:53:19 -0000	1.42.2.4
  +++ mod_headers.c	24 Apr 2004 11:51:07 -0000	1.42.2.5
  @@ -435,7 +435,7 @@
           else
               str = apr_pstrcat(r->pool, str, s, NULL);
       }
  -    return str;
  +    return str ? str : "";
   }
   
   static int echo_header(echo_do *v, const char *key, const char *val)
  
  
  

Mime
View raw message