Merge r1359881 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

r1052419 changed the default value of Options to FollowSymlinks,
but inadvertently made "AllowOverride Options" behave like
"AllowOverride Options=FollowSymLinks".

PR53444

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361377 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 51770d244f73fc74718fc338834708b58088ae32..32225246bc248a515ced06be5154384a9ed9afe9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,10 @@ Changes with Apache 2.4.3
      possible XSS for a site where untrusted users can upload files to
      a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
 
+  *) core: Fix spurious "not allowed here" error returned when the Options 
+     directive is used in .htaccess and "AllowOverride Options" (with no 
+     specific options restricted) is configured.  PR 53444. [Eric Covener]
+
   *) mod_authz_core: Fix parsing of Require arguments in <AuthzProviderAlias>.
      PR 53048. [Stefan Fritsch]
 

diff --git a/STATUS b/STATUS
index 2cbd73aff25ced9eb696bb5b69227d9976cfd132..dbe28ea1f5ce324953576a2aa1f93560709f2b01 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,13 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * core: "AllowOverride Options" inadvertently treated like
-           "AllowOverride Options=FollowSymlinks" after r1052419
-            PR53444
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1359976
-     2.4.x patch: trunk works (+ CHANGES)
-     +1: covener, jim, humbedooh
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/server/core.c b/server/core.c
index 541f6e8e74af5017d79ec3da2b9ceddfa01c2fec..c7a9df061d82cda62885cfabb44bbdeb68ad0fcb 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -1612,7 +1612,7 @@ static const char *set_override(cmd_parms *cmd, void *d_, const char *l)
             if (v)
                 set_allow_opts(cmd, &(d->override_opts), v);
             else
-                d->override_opts = OPT_SYM_LINKS;
+                d->override_opts = OPT_ALL;
         }
         else if (!strcasecmp(w, "FileInfo")) {
             d->override |= OR_FILEINFO;