| author | Stefan Teleman <stefan.teleman@oracle.com> |
| Mon, 16 Mar 2015 13:28:51 -0700 | |
| changeset 3955 | 4e310c8109a5 |
| parent 2079 | 46ce7840065c |
| permissions | -rw-r--r-- |
|
2079
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1331
diff
changeset
|
1 |
Patch origin: in-house |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1331
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
1331
0d14e812ca53
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
2079
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1331
diff
changeset
|
4 |
Allows SMF method to override Apache binary and provide additional |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1331
diff
changeset
|
5 |
arguments and thus select desired MPM. |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1331
diff
changeset
|
6 |
|
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1331
diff
changeset
|
7 |
--- support/apachectl.in |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1331
diff
changeset
|
8 |
+++ support/apachectl.in |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1331
diff
changeset
|
9 |
@@ -42,7 +42,7 @@ |
|
1331
0d14e812ca53
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
# -------------------- -------------------- |
|
0d14e812ca53
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
# |
|
0d14e812ca53
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
# 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
|
13 |
-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
|
14 |
+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
|
15 |
# |
|
0d14e812ca53
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
# 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
|
17 |
if test -f @exp_sbindir@/envvars; then |