Bug#396265: NMU uploaded in 48h

[Andreas Barth <aba@not.so.argh.org>]

Hi,

I prepared an NMU of your package, and at it in 48 hours.

Please see this as help to get the package into a releaseable condition for
etch.

Please find the used diff below.


Cheers,
Andi

diff -Nur ../apache2-2.2.3~/apache2-2.2.3/debian/patches/043_ajp_connection_reuse ../apache2-2.2.3/apache2-2.2.3/debian/patches/043_ajp_connection_reuse
--- ../apache2-2.2.3~/apache2-2.2.3/debian/patches/043_ajp_connection_reuse	1970-01-01 00:00:00.000000000 +0000
+++ ../apache2-2.2.3/apache2-2.2.3/debian/patches/043_ajp_connection_reuse	2006-12-09 21:05:28.000000000 +0000
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 043_ajp_connection_reuse by Steinar H. Gunderson <sesse@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix flaw in ajp connection reuse; see Apache Bugzille #40310.
+## DP: Patch by Ian Abel, also exists in upstream Subversion (r434483).
+
+@DPATCH@
+--- apache2/modules/proxy/mod_proxy_ajp.c
++++ apache2/modules/proxy/mod_proxy_ajp.c
+@@ -175,6 +175,7 @@
+                                 AJP13_MAX_SEND_BODY_SZ);
+ 
+         if (status != APR_SUCCESS) {
++            conn->close++;
+             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+                          "proxy: ap_get_brigade failed");
+             apr_brigade_destroy(input_brigade);
+
diff -Nur ../apache2-2.2.3~/debian/changelog ../apache2-2.2.3/debian/changelog
--- ../apache2-2.2.3~/debian/changelog	2006-12-09 20:57:27.000000000 +0000
+++ ../apache2-2.2.3/debian/changelog	2006-12-09 21:06:14.000000000 +0000
@@ -1,3 +1,12 @@
+apache2 (2.2.3-3.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * 043_ajp_connection_reuse: Patch from upstream Bugzilla, fixing a critical
+    issue with regard to connection reuse in mod_proxy_ajp.
+    Closes: #396265
+
+ -- Andreas Barth <aba@not.so.argh.org>  Sat,  9 Dec 2006 21:05:45 +0000
+
 apache2 (2.2.3-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nur ../apache2-2.2.3~/debian/patches/00list ../apache2-2.2.3/debian/patches/00list
--- ../apache2-2.2.3~/debian/patches/00list	2006-12-09 20:57:27.000000000 +0000
+++ ../apache2-2.2.3/debian/patches/00list	2006-12-09 21:05:28.000000000 +0000
@@ -11,4 +11,5 @@
 034_apxs2_libtool_fixtastic
 038_no_LD_LIBRARY_PATH
 042_htdigest_CAN-2005-1344
+043_ajp_connection_reuse
 099_config_guess_sub_update