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

[dougm]

dougm       98/11/30 14:26:49

  Modified:    src      CHANGES
               src/modules/standard mod_include.c
  Log:
  mod_include.c:handle_perl() now properly tests for OPT_INCNOEXEC
  rather than OPT_INCLUDES
  
  Submitted by: Rainer Schoepf <[EMAIL PROTECTED]>
  Reviewed by:  Doug MacEachern
  
  Revision  Changes    Path
  1.1152    +2 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1151
  retrieving revision 1.1152
  diff -u -r1.1151 -r1.1152
  --- CHANGES   1998/11/25 04:36:10     1.1151
  +++ CHANGES   1998/11/30 22:26:47     1.1152
  @@ -1,4 +1,6 @@
   Changes with Apache 1.3.4
  +  *) mod_include.c:handle_perl() now properly tests for OPT_INCNOEXEC
  +     rather than OPT_INCLUDES [Rainer Schoepf <[EMAIL PROTECTED]>]
   
     *) ap_md5_binary() was using sprintf() rather than a table lookup
        to convert binary bytes to hex digits.
  
  
  
  1.107     +1 -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.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- mod_include.c     1998/11/09 07:03:19     1.106
  +++ mod_include.c     1998/11/30 22:26:49     1.107
  @@ -952,7 +952,7 @@
       SV *sub = Nullsv;
       AV *av = newAV();
   
  -    if (!(ap_allow_options(r) & OPT_INCLUDES)) {
  +    if (ap_allow_options(r) & OPT_INCNOEXEC) {
           ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "httpd: #perl SSI disallowed by IncludesNoExec in %s",
                       r->filename);