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/filters mod_include.c
Date Thu, 23 Oct 2003 20:07:46 GMT
nd          2003/10/23 13:07:46

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/filters Tag: APACHE_2_0_BRANCH mod_include.c
  Log:
  fix segfault which occured if the filename was not
  set, for example, when processing some error conditions.
  
  PR: 23836
  Reviewed by: Jeff Trawick, Cliff Woolley
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.172 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.171
  retrieving revision 1.988.2.172
  diff -u -u -r1.988.2.171 -r1.988.2.172
  --- CHANGES	14 Oct 2003 03:43:16 -0000	1.988.2.171
  +++ CHANGES	23 Oct 2003 20:07:45 -0000	1.988.2.172
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.48
   
  +  *) mod_include: fix segfault which occured if the filename was not
  +     set, for example, when processing some error conditions.
  +     PR 23836.  [Brian Akins <bakins@web.turner.com>, André Malo]
  +
     *) fix the config parser to support <Foo>..</Foo> containers (no
        arguments in the opening tag) supported by httpd 1.3. Without
        this change mod_perl 2.0's <Perl> sections are broken.
  
  
  
  1.751.2.506 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.505
  retrieving revision 1.751.2.506
  diff -u -u -r1.751.2.505 -r1.751.2.506
  --- STATUS	22 Oct 2003 17:40:26 -0000	1.751.2.505
  +++ STATUS	23 Oct 2003 20:07:45 -0000	1.751.2.506
  @@ -260,11 +260,6 @@
           modules/generators/mod_info.c r1.151
         +1: trawick
   
  -    * mod_include: fix segfault which occured if the filename was not
  -      set, for example, when processing some error conditions. PR 23836.
  -        modules/filters/mod_include.c: r1.288
  -      +1: nd, trawick, jwoolley
  -
       * Set the scoreboard state to indicate logging prior to running
         logging hooks so that server-status will show 'L' for hung
         loggers instead of 'W'.
  
  
  
  No                   revision
  No                   revision
  1.232.2.4 +1 -1      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.232.2.3
  retrieving revision 1.232.2.4
  diff -u -u -r1.232.2.3 -r1.232.2.4
  --- mod_include.c	21 Sep 2003 21:29:27 -0000	1.232.2.3
  +++ mod_include.c	23 Oct 2003 20:07:46 -0000	1.232.2.4
  @@ -155,7 +155,7 @@
           apr_table_setn(e, "DOCUMENT_PATH_INFO", r->path_info);
       }
       apr_table_setn(e, "USER_NAME", LAZY_VALUE);
  -    if ((t = strrchr(r->filename, '/'))) {
  +    if (r->filename && (t = strrchr(r->filename, '/'))) {
           apr_table_setn(e, "DOCUMENT_NAME", ++t);
       }
       else {
  
  
  

Mime
View raw message