From: Rich Bowen <rbowen@apache.org>
Date: Wed, 23 Mar 2011 20:11:43 +0000 (+0000)
Subject: Or, perhaps that's even clearer, without getting too verbose.
X-Git-Tag: 2.3.12~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30fa792204eae0c24ea2fe7acf22c82979f68703;p=thirdparty%2Fapache%2Fhttpd.git

Or, perhaps that's even clearer, without getting too verbose.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1084714 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index e9ee6418eb9..25b348c44ce 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -4728,7 +4728,7 @@ static int hook_fixup(request_rec *r)
     if (!(ap_allow_options(r) & (OPT_SYM_LINKS | OPT_SYM_OWNER))) {
         /* FollowSymLinks is mandatory! */
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                     "Options FollowSymLinks or SymLinksIfOwnerMatch is off, "
+                     "Options FollowSymLinks and SymLinksIfOwnerMatch are both off, "
                      "so the RewriteRule directive is also forbidden "
                      "due to its similar ability to circumvent directory restrictions : "
                      "%s", r->filename);