httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1226955 - in /httpd/httpd/branches/2.2.x: CHANGES server/protocol.c
Date Tue, 03 Jan 2012 21:29:23 GMT
Author: sf
Date: Tue Jan  3 21:29:23 2012
New Revision: 1226955

URL: http://svn.apache.org/viewvc?rev=1226955&view=rev
Log:
Merge r895483:
Fix segfault in ap_send_interim_response().

PR: 52315

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/server/protocol.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1226955&r1=1226954&r2=1226955&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Jan  3 21:29:23 2012
@@ -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>]
 

Modified: httpd/httpd/branches/2.2.x/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/protocol.c?rev=1226955&r1=1226954&r2=1226955&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/protocol.c (original)
+++ httpd/httpd/branches/2.2.x/server/protocol.c Tue Jan  3 21:29:23 2012
@@ -1681,7 +1681,7 @@ AP_DECLARE(void) ap_send_interim_respons
         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;
     }



Mime
View raw message