← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/032_suexec_is_shared

  • 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/032_suexec_is_shared
1
 
--- build-tree.orig/apache2/os/unix/unixd.c     2004-09-27 19:53:29.000000000 -0600
2
 
+++ build-tree/apache2/os/unix/unixd.c  2004-09-27 19:56:57.000000000 -0600
3
 
@@ -208,6 +208,10 @@
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 032_suexec_is_shared by Adam Conrad <adconrad@0c3.net>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Patch to allow suEXEC as shared.
 
6
 
 
7
@DPATCH@
 
8
--- apache2/os/unix/unixd.c     2004-09-27 19:53:29.000000000 -0600
 
9
+++ apache2/os/unix/unixd.c     2004-09-27 19:56:57.000000000 -0600
 
10
@@ -209,6 +209,10 @@
4
11
 
5
12
     /* Check for suexec */
6
13
     unixd_config.suexec_enabled = 0;
8
15
+    if (ap_find_linked_module("mod_suexec.c") == NULL) {
9
16
+       return;
10
17
+    }
11
 
     if ((apr_stat(&wrapper, SUEXEC_BIN, 
 
18
     if ((apr_stat(&wrapper, SUEXEC_BIN,
12
19
                   APR_FINFO_NORM, ptemp)) != APR_SUCCESS) {
13
20
         return;