[Pkg-apache-commits] r1007 - in /trunk/apache2: changelog patches/00list patches/068_mod_dav_detect_EOF.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Tue Jul 28 16:27:18 2009
New Revision: 1007

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1007
Log:
Fix HTTP PUT with mod_dav failing to detect an aborted connection

Added:
    trunk/apache2/patches/068_mod_dav_detect_EOF.dpatch
Modified:
    trunk/apache2/changelog
    trunk/apache2/patches/00list

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1007&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Tue Jul 28 16:27:18 2009
@@ -18,6 +18,8 @@
     MaxClients into the correct order so that Apache does not complain
     (closes: #495656).
     Also add a configuration block for the event MPM in apache2.conf.
+  * Fix HTTP PUT with mod_dav failing to detect an aborted connection
+    (closes: #451563).
   * Change references to httpd.conf in apache2-doc to apache2.conf
     (closes: #465393).
   * Clarify the recommended permissions for SSL certificates in README.Debian

Modified: trunk/apache2/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/00list?rev=1007&op=diff
==============================================================================
--- trunk/apache2/patches/00list (original)
+++ trunk/apache2/patches/00list Tue Jul 28 16:27:18 2009
@@ -17,6 +17,7 @@
 057_disablemods.dpatch
 058_suexec-CVE-2007-1742.dpatch
 067_fix_segfault_in_ab.dpatch
+068_mod_dav_detect_EOF.dpatch
 099_config_guess_sub_update
 200_cp_suexec.dpatch
 201_build_suexec-custom.dpatch

Added: trunk/apache2/patches/068_mod_dav_detect_EOF.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/068_mod_dav_detect_EOF.dpatch?rev=1007&op=file
==============================================================================
--- trunk/apache2/patches/068_mod_dav_detect_EOF.dpatch (added)
+++ trunk/apache2/patches/068_mod_dav_detect_EOF.dpatch Tue Jul 28 16:27:18 2009
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## DP: Detect aborted connections for PUT and POST (Bug#451563)
+## Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=33098
+
+ at DPATCH@
+--- httpd/httpd/trunk/modules/http/http_filters.c	2009/07/09 06:24:53	792408
++++ httpd/httpd/trunk/modules/http/http_filters.c	2009/07/09 06:28:54	792409
+@@ -524,6 +524,11 @@
+ 
+     if (ctx->state != BODY_NONE) {
+         ctx->remaining -= totalread;
++        if (ctx->remaining > 0) {
++            e = APR_BRIGADE_LAST(b);
++            if (APR_BUCKET_IS_EOS(e))
++                return APR_EOF;
++        }
+     }
+ 
+     /* If we have no more bytes remaining on a C-L request,