httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Thu, 30 Aug 2001 21:29:15 GMT
jerenkrantz    01/08/30 14:29:15

  Modified:    .        CHANGES
               modules/filters mod_include.c
  Log:
  Fix a segfault with mod_include when r->path_info is not set
  (which is the case with mod_proxy).
  
  My only question about this is whether we should place some value
  (such as <UNKNOWN>) when path_info isn't set.
  
  Submitted by:	Ian Holsman <ianh@cnet.com>
  Reviewed by:	Justin Erenkrantz
  
  Revision  Changes    Path
  1.350     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.349
  retrieving revision 1.350
  diff -u -r1.349 -r1.350
  --- CHANGES	2001/08/30 20:50:06	1.349
  +++ CHANGES	2001/08/30 21:29:14	1.350
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.26-dev
   
  +  *) Fix a segfault with mod_include when r->path_info is not set
  +     (which is the case with mod_proxy).  [Ian Holsman <ianh@cnet.com>]
  +
     *) Add -X functionality back.  This indicates to all MPMs and any other
        part of Apache that it should run in "debug" mode.  [Justin Erenkrantz]
   
  
  
  
  1.137     +3 -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.136
  retrieving revision 1.137
  diff -u -r1.136 -r1.137
  --- mod_include.c	2001/08/27 20:25:42	1.136
  +++ mod_include.c	2001/08/30 21:29:15	1.137
  @@ -113,7 +113,9 @@
       apr_table_setn(e, "LAST_MODIFIED",
                 ap_ht_time(r->pool, r->finfo.mtime, timefmt, 0));
       apr_table_setn(e, "DOCUMENT_URI", r->uri);
  -    apr_table_setn(e, "DOCUMENT_PATH_INFO", r->path_info);
  +    if (r->path_info && *r->path_info) {
  +        apr_table_setn(e, "DOCUMENT_PATH_INFO", r->path_info);
  +    }
       if (apr_get_username(&pwname, r->finfo.user, r->pool) == APR_SUCCESS) {
           apr_table_setn(e, "USER_NAME", pwname);
       }
  
  
  

Mime
View raw message