← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/002_apachectl

  • 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/002_apachectl
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 002_apachectl by Adam Conrad <adconrad@0c3.net>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: envvars lives in /etc/apache2 in our setup.
 
6
 
 
7
@DPATCH@
 
8
--- apache2/support/apachectl.in        2003-05-07 13:18:19.000000000 +0100
 
9
+++ apache2/support/apachectl.in        2003-05-07 13:17:37.000000000 +0100
 
10
@@ -31,8 +31,8 @@
 
11
 HTTPD='@exp_sbindir@/@progname@'
 
12
 #
 
13
 # pick up any necessary environment variables
 
14
-if test -f @exp_sbindir@/envvars; then
 
15
-  . @exp_sbindir@/envvars
 
16
+if test -f @exp_sysconfdir@/envvars; then
 
17
+  . @exp_sysconfdir@/envvars
 
18
 fi
 
19
 #
 
20
 # a command that outputs a formatted text version of the HTML at the