httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Tue, 07 Aug 2001 02:34:42 GMT
jwoolley    01/08/06 19:34:42

  Modified:    server   request.c
  Log:
  Fix a segfault (was getting triggered by mod_include at least) caused
  by calling ap_allow_options() before setting rnew->per_dir_config.
  
  This is the "easy looking" fix but might have side effects of which I'm
  unaware... please double-check this change for correctness.
  
  Revision  Changes    Path
  1.22      +2 -2      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -d -u -r1.21 -r1.22
  --- request.c	2001/08/06 05:26:37	1.21
  +++ request.c	2001/08/07 02:34:42	1.22
  @@ -1510,6 +1510,8 @@
           rnew->filename = ap_make_full_path(rnew->pool, fdir, new_file);
           ap_parse_uri(rnew, rnew->uri);    /* fill in parsed_uri values */
   
  +        rnew->per_dir_config = r->per_dir_config;
  +
           /*
            * If this is an APR_LNK that resolves to an APR_DIR, then 
            * we will rerun everything anyways... this should be safe.
  @@ -1530,8 +1532,6 @@
               rnew->status = res;
               return rnew;
           }
  -
  -        rnew->per_dir_config = r->per_dir_config;
   
           if (rnew->finfo.filetype == APR_LNK
               && (res = resolve_symlink(rnew->filename, &rnew->finfo, 
  
  
  

Mime
View raw message