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_expires.c
Date Sat, 24 Apr 2004 11:43:02 GMT
nd          2004/04/24 04:43:02

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/metadata Tag: APACHE_2_0_BRANCH mod_expires.c
  Log:
  fix segfault, which occurs if no CT is set and wildcards are used.
  
  PR: 28047
  Reviewed by: Brad Nicholes, Jeff Trawick
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.269 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.268
  retrieving revision 1.988.2.269
  diff -u -u -r1.988.2.268 -r1.988.2.269
  --- CHANGES	22 Apr 2004 07:22:53 -0000	1.988.2.268
  +++ CHANGES	24 Apr 2004 11:43:00 -0000	1.988.2.269
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.50
   
  +  *) Fix segfault in mod_expires, which occured under certain
  +     circumstances. PR 28047.  [André Malo]
  +
     *) htpasswd: use apr_temp_dir_get() and general cleanup
        [Guenter Knauf <eflash gmx.net>, Thom May]
   
  
  
  
  1.751.2.833 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.832
  retrieving revision 1.751.2.833
  diff -u -u -r1.751.2.832 -r1.751.2.833
  --- STATUS	24 Apr 2004 11:28:20 -0000	1.751.2.832
  +++ STATUS	24 Apr 2004 11:43:01 -0000	1.751.2.833
  @@ -144,10 +144,6 @@
            http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.272&r2=1.273
          +1: nd (geoff)
   
  -    *) Fix segfault in mod_expires. PR 28047
  -         modules/metadata/mod_expires.c: r1.54
  -       +1: nd, bnicholes, trawick
  -
       *) Fix memory leak in mod_rewrite. PR 27862. (2.0 + 1.3)
            http://www.apache.org/~nd/mod_rewrite_fixleak.diff
          +1: nd
  
  
  
  No                   revision
  No                   revision
  1.39.2.12 +1 -1      httpd-2.0/modules/metadata/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.c,v
  retrieving revision 1.39.2.11
  retrieving revision 1.39.2.12
  diff -u -u -r1.39.2.11 -r1.39.2.12
  --- mod_expires.c	9 Feb 2004 20:53:19 -0000	1.39.2.11
  +++ mod_expires.c	24 Apr 2004 11:43:02 -0000	1.39.2.12
  @@ -482,7 +482,7 @@
                   char *checkmime;
                   char *spos;
                   checkmime = apr_pstrdup(r->pool, r->content_type);
  -                spos = strchr(checkmime, '/');
  +                spos = checkmime ? ap_strchr(checkmime, '/') : NULL;
                   if (spos != NULL) {
                       /*
                        * Without a '/' character, nothing we have will match.
  
  
  

Mime
View raw message