From: Eric Covener <covener@apache.org>
Date: Mon, 19 Jun 2017 19:08:49 +0000 (+0000)
Subject: fix for RewriteOptions processing in r1798938
X-Git-Tag: 2.5.0-alpha~371
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e46d22766e348926340570d54881b82a178045a0;p=thirdparty%2Fapache%2Fhttpd.git

fix for RewriteOptions processing in r1798938


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

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 55a7b32cb81..9647c6f55b7 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -4336,14 +4336,15 @@ static int apply_rewrite_list(request_rec *r, apr_array_header_t *rewriterules,
     int s;
     rewrite_ctx *ctx;
     int round = 1;
-    rewrite_server_conf *sconf = ap_get_module_config(
-                                 r->server->module_config, &rewrite_module);
+    rewrite_perdir_conf *dconf = (rewrite_perdir_conf *)
+                                 ap_get_module_config(r->per_dir_config,
+                                                      &rewrite_module);
 
     ctx = apr_palloc(r->pool, sizeof(*ctx));
     ctx->perdir = perdir;
     ctx->r = r;
 
-    if (sconf->options & OPTION_LONGOPT) { 
+    if (dconf->options & OPTION_LONGOPT) { 
         apr_pool_create(&(ctx->temp_pool), r->pool);
     }
     else {