← Back to branch summary

~ubuntu-branches/ubuntu/feisty/apache2/feisty

« back to all changes in this revision

Viewing changes to debian/patches/043_ajp_connection_reuse

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Barth
  • Date: 2006-12-09 21:05:45 UTC
  • mfrom: (0.6.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20061209210545-h70s0xaqc2v8vqr2
Tags: 2.2.3-3.2
http://bugs.debian.org/396265
* 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/043_ajp_connection_reuse
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 043_ajp_connection_reuse by Steinar H. Gunderson <sesse@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Fix flaw in ajp connection reuse; see Apache Bugzille #40310.
 
6
## DP: Patch by Ian Abel, also exists in upstream Subversion (r434483).
 
7
 
 
8
@DPATCH@
 
9
--- apache2/modules/proxy/mod_proxy_ajp.c
 
10
+++ apache2/modules/proxy/mod_proxy_ajp.c
 
11
@@ -175,6 +175,7 @@
 
12
                                 AJP13_MAX_SEND_BODY_SZ);
 
13
 
 
14
         if (status != APR_SUCCESS) {
 
15
+            conn->close++;
 
16
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
 
17
                          "proxy: ap_get_brigade failed");
 
18
             apr_brigade_destroy(input_brigade);
 
19