httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1634519 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/dav/main/mod_dav.c
Date Mon, 27 Oct 2014 12:38:40 GMT
Author: jim
Date: Mon Oct 27 12:38:40 2014
New Revision: 1634519

URL: http://svn.apache.org/r1634519
Log:
Merge r1527509 from trunk:

mod_dav: set r->status_line in dav_error_response.
It's used as argument in next ap_rvputs call. PR 55426.

Submitted by: jkaluza
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1527509

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1634519&r1=1634518&r2=1634519&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Oct 27 12:38:40 2014
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.4.11
 
+  *) mod_dav: Set r->status_line in dav_error_response. PR 55426.
+
   *) SECURITY: CVE-2014-3581 (cve.mitre.org)
      mod_cache: Avoid a crash when Content-Type has an empty value.
      PR 56924.  [Mark Montague <mark catseye.org>, Jan Kaluza]

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1634519&r1=1634518&r2=1634519&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Oct 27 12:38:40 2014
@@ -102,12 +102,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_dav: set r->status_line in dav_error_response.
-     It's used as argument in next ap_rvputs call. PR 55426.
-     trunk patch: http://svn.apache.org/r1527509
-     2.4.x patch: trunk works
-     +1: jkaluza, ylavic, rjung
-
    * mod_proxy: Make worker name truncation a non-fatal error.
      trunk patch: http://svn.apache.org/r1621367
                   http://svn.apache.org/r1621372

Modified: httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c?rev=1634519&r1=1634518&r2=1634519&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c Mon Oct 27 12:38:40 2014
@@ -315,6 +315,7 @@ static const char *dav_cmd_davmintimeout
 static int dav_error_response(request_rec *r, int status, const char *body)
 {
     r->status = status;
+    r->status_line = ap_get_status_line(status);
 
     ap_set_content_type(r, "text/html; charset=ISO-8859-1");
 



Mime
View raw message