Fix a segfault in mod_rewrite's logging code caused by passing the

wrong config to ap_get_remote_host().

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

diff --git a/CHANGES b/CHANGES
index 3d4d04af28497404f1476d7b991bf414b50ed7b8..5b3f8e3ba0c2baf8a2ab54124999c0061bf4b807 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.31-dev
 
+  *) Fix a segfault in mod_rewrite's logging code caused by passing the
+     wrong config to ap_get_remote_host().  [Jeff Trawick]
+
   *) Allow mod_cgid to work from a binary distribution install by
      using 755 for the permissions on the log directory instead of
      750.  [Jeff Trawick]

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 254e81499637c56fb7a3fa7f1c96b846fa9b2a5f..ceb8bc517db8de613d21596f5a62b3f64a091fca 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3181,7 +3181,7 @@ static void rewritelog(request_rec *r, int level, const char *text, ...)
         ruser = "\"\"";
     }
 
-    rhost = ap_get_remote_host(conn, r->server->module_config, 
+    rhost = ap_get_remote_host(conn, r->per_dir_config, 
                                REMOTE_NOLOOKUP, NULL);
     if (rhost == NULL) {
         rhost = "UNKNOWN-HOST";