cvs commit: apache-1.3/src/modules/standard mod_include.c

[marc]

marc        98/04/11 22:50:37

  Modified:    src/modules/standard mod_include.c
  Log:
  Skip the nested include kludge of the subreq doesn't exist because
  it wasn't permitted.  This avoids dereferencing a null pointer.
  
  PR: 2037
  
  Revision  Changes    Path
  1.82      +2 -1      apache-1.3/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- mod_include.c     1998/04/11 12:00:47     1.81
  +++ mod_include.c     1998/04/12 05:50:36     1.82
  @@ -689,7 +689,8 @@
               }
   
            /* see the Kludge in send_parsed_file for why */
  -         ap_set_module_config(rr->request_config, &includes_module, r);
  +         if (rr) 
  +             ap_set_module_config(rr->request_config, &includes_module, r);
   
   #ifdef CHARSET_EBCDIC
               ap_bsetflag(rr->connection->client, B_EBCDIC2ASCII, 0);