components/apache2/patches/apachectl.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 05 May 2015 06:49:34 -0500
changeset 4253 d6f30e77062b
parent 1331 0d14e812ca53
child 1346 ebb3e4503fed
permissions -rw-r--r--
21032971 pycparser license generation should have .prep dependency
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1331
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
Allows SMF method to override Apache binary to start and thus select if
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     2
we want prefork/worker Apache MPM.
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
--- support/apachectl.in	Tue Jul 11 20:38:44 2006
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
+++ support/apachectl.in	Tue May 14 07:40:03 2013
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
@@ -41,7 +41,7 @@
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
 # --------------------                              --------------------
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
 # 
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
 # the path to your httpd binary, including options if necessary
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
-HTTPD='@exp_sbindir@/@progname@'
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
+HTTPD=${HTTPD:-@exp_sbindir@/@progname@}
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
 #
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
 # pick up any necessary environment variables
0d14e812ca53 15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
 if test -f @exp_sbindir@/envvars; then