← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/001_apachectl_is_differently_fucked

  • 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/001_apachectl_is_differently_fucked
1
 
diff -ruN -x Makefile.in -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/support/apachectl.in build-tree/apache2/support/apachectl.in
2
 
--- build-tree/apache2/support/apachectl.in     2003-05-07 13:18:19.000000000 +0100
3
 
+++ build-tree/apache2/support/apachectl.in     2003-05-07 13:17:37.000000000 +0100
4
 
@@ -31,8 +31,8 @@
5
 
 HTTPD='@exp_sbindir@/@progname@'
6
 
 #
7
 
 # pick up any necessary environment variables
8
 
-if test -f @exp_sbindir@/envvars; then
9
 
-  . @exp_sbindir@/envvars
10
 
+if test -f @exp_sysconfdir@/envvars; then
11
 
+  . @exp_sysconfdir@/envvars
12
 
 fi
13
 
 #
14
 
 # a command that outputs a formatted text version of the HTML at the