From: Stefan Fritsch <sf@apache.org>
Date: Tue, 3 Jan 2012 21:29:23 +0000 (+0000)
Subject: Merge r895483:
X-Git-Tag: 2.2.22~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48e10f5b8d92577b352d0ef03f5cbf2975e584d7;p=thirdparty%2Fapache%2Fhttpd.git

Merge r895483:
Fix segfault in ap_send_interim_response().

PR: 52315


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

diff --git a/CHANGES b/CHANGES
index b75c9f3aa37..0ead4fe5af0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes with Apache 2.2.22
      specification, preventing unexpected expansion of target URLs in
      some reverse proxy configurations.  [Joe Orton]
 
+  *) core: Fix segfault in ap_send_interim_response(). PR 52315.
+     [Stefan Fritsch]
+
   *) mod_log_config: Prevent segfault. PR 50861. [Torsten Förtsch
      <torsten.foertsch gmx.net>]
 
diff --git a/server/protocol.c b/server/protocol.c
index b45851a81a5..d0180962e44 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1681,7 +1681,7 @@ AP_DECLARE(void) ap_send_interim_response(request_rec *r, int send_headers)
         return;
     }
     if (!ap_is_HTTP_INFO(r->status)) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, NULL,
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                       "Status is %d - not sending interim response", r->status);
         return;
     }