Bug#396265: apache2: diff for NMU version 2.2.3-3.1
tags 396265 + patch
thanks
Hi,
Attached is the diff for my apache2 2.2.3-3.1 NMU, currently in
DELAYED/3-day.
diff -Nru /tmp/vWCnuPvxj3/apache2-2.2.3/debian/changelog /tmp/kFoWiQ4qgN/apache2-2.2.3/debian/changelog
--- /tmp/vWCnuPvxj3/apache2-2.2.3/debian/changelog 2006-11-11 18:14:02.000000000 +0100
+++ /tmp/kFoWiQ4qgN/apache2-2.2.3/debian/changelog 2006-11-11 18:14:02.000000000 +0100
@@ -1,3 +1,12 @@
+apache2 (2.2.3-3.1) unstable; urgency=medium
+
+ * 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)
+
+ -- Steinar H. Gunderson <sesse@debian.org> Sat, 11 Nov 2006 17:51:53 +0100
+
apache2 (2.2.3-3) unstable; urgency=medium
[ Peter Samuelson ]
diff -Nru /tmp/vWCnuPvxj3/apache2-2.2.3/debian/patches/00list /tmp/kFoWiQ4qgN/apache2-2.2.3/debian/patches/00list
--- /tmp/vWCnuPvxj3/apache2-2.2.3/debian/patches/00list 2006-11-11 18:14:02.000000000 +0100
+++ /tmp/kFoWiQ4qgN/apache2-2.2.3/debian/patches/00list 2006-11-11 18:14:02.000000000 +0100
@@ -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
diff -Nru /tmp/vWCnuPvxj3/apache2-2.2.3/debian/patches/043_ajp_connection_reuse /tmp/kFoWiQ4qgN/apache2-2.2.3/debian/patches/043_ajp_connection_reuse
--- /tmp/vWCnuPvxj3/apache2-2.2.3/debian/patches/043_ajp_connection_reuse 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/kFoWiQ4qgN/apache2-2.2.3/debian/patches/043_ajp_connection_reuse 2006-11-11 18:14:02.000000000 +0100
@@ -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);
+
Reply to: