Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 25 Jan 2003 00:01:11 -0000
Message-ID: <20030125000111.29472.qmail@icarus.apache.org>
From: nd@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/mappers mod_rewrite.c

nd          2003/01/24 16:01:11

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/mappers Tag: APACHE_2_0_BRANCH mod_rewrite.c
  Log:
  backport from 2.1: allow RewriteEngine Off even if Options -FollowSymlinks
  
  PR: 12395
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.25 +4 -1      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.24
  retrieving revision 1.988.2.25
  diff -u -r1.988.2.24 -r1.988.2.25
  --- CHANGES	24 Jan 2003 09:26:45 -0000	1.988.2.24
  +++ CHANGES	25 Jan 2003 00:01:09 -0000	1.988.2.25
  @@ -1,10 +1,13 @@
   Changes with Apache 2.0.45
   
  +  *) mod_rewrite: Allow "RewriteEngine Off" even if no "Options FollowSymlinks"
  +     (or SymlinksIfOwnermatch) is set. PR 12395.  [Andr� Malo]
  +
     *) apxs: Include any special APR ld flags when linking the DSO.
        This resolves problems on AIX when building a DSO with apxs+gcc.
        [Jeff Trawick]
   
  -   *) Added character set support to mod_auth_LDAP to allow it to 
  +  *) Added character set support to mod_auth_LDAP to allow it to 
        convert extended characters used in the user ID to UTF-8 
        before authenticating against the LDAP directory. The new
        directive AuthLDAPCharsetConfig is used to specify the config
  
  
  
  1.751.2.65 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.64
  retrieving revision 1.751.2.65
  diff -u -r1.751.2.64 -r1.751.2.65
  --- STATUS	24 Jan 2003 18:57:27 -0000	1.751.2.64
  +++ STATUS	25 Jan 2003 00:01:09 -0000	1.751.2.65
  @@ -69,10 +69,6 @@
       * mod_file_cache segfault bugfix. PR 16313.
        +1: stoddard, orlikowski, striker
   
  -    * Allow RewriteEngine Off even if Options -FollowSymlinks. PR 12395.
  -      modules/mappers/mod_rewrite.c r1.136
  -      +1: nd, jerenkrantz, trawick
  -
       * Use saner default config values for suexec. PR 15713.
         support/suexec.h r1.8
         +1: nd, jerenkrantz, trawick
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.135.2.1 +8 -8      httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.135
  retrieving revision 1.135.2.1
  diff -u -r1.135 -r1.135.2.1
  --- mod_rewrite.c	4 Oct 2002 16:57:38 -0000	1.135
  +++ mod_rewrite.c	25 Jan 2003 00:01:10 -0000	1.135.2.1
  @@ -1413,6 +1413,14 @@
        *  only do something under runtime if the engine is really enabled,
        *  for this directory, else return immediately!
        */
  +    if (dconf->state == ENGINE_DISABLED) {
  +        return DECLINED;
  +    }
  +
  +    /*
  +     *  Do the Options check after engine check, so
  +     *  the user is able to explicitely turn RewriteEngine Off.
  +     */
       if (!(ap_allow_options(r) & (OPT_SYM_LINKS | OPT_SYM_OWNER))) {
           /* FollowSymLinks is mandatory! */
           ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
  @@ -1420,14 +1428,6 @@
                        "which implies that RewriteRule directive is forbidden: "
                        "%s", r->filename);
           return HTTP_FORBIDDEN;
  -    }
  -    else {
  -        /* FollowSymLinks is given, but the user can
  -         * still turn off the rewriting engine
  -         */
  -        if (dconf->state == ENGINE_DISABLED) {
  -            return DECLINED;
  -        }
       }
   
       /*