| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Wed, 18 Sep 2013 06:33:34 -0700 | |
| branch | s11-update |
| changeset 2765 | da9ddef602cf |
| child 1346 | ebb3e4503fed |
| permissions | -rw-r--r-- |
|
2765
da9ddef602cf
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 |
|
da9ddef602cf
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. |
|
da9ddef602cf
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
da9ddef602cf
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 |
|
da9ddef602cf
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 |
|
da9ddef602cf
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 @@ |
|
da9ddef602cf
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
# -------------------- -------------------- |
|
da9ddef602cf
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
# |
|
da9ddef602cf
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 |
|
da9ddef602cf
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@' |
|
da9ddef602cf
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@}
|
|
da9ddef602cf
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
# |
|
da9ddef602cf
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 |
|
da9ddef602cf
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 |