| author | John Beck <John.Beck@Oracle.COM> |
| Wed, 04 Mar 2015 10:42:54 -0800 | |
| branch | s11-update |
| changeset 3981 | 3584872e1034 |
| parent 3877 | d7cb5bc8ee50 |
| permissions | -rw-r--r-- |
|
3877
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2765
diff
changeset
|
1 |
Patch origin: in-house |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2765
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
2765
da9ddef602cf
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
3877
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2765
diff
changeset
|
4 |
Allows SMF method to override Apache binary and provide additional |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2765
diff
changeset
|
5 |
arguments and thus select desired MPM. |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2765
diff
changeset
|
6 |
|
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2765
diff
changeset
|
7 |
--- support/apachectl.in |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2765
diff
changeset
|
8 |
+++ support/apachectl.in |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2765
diff
changeset
|
9 |
@@ -42,7 +42,7 @@ |
|
2765
da9ddef602cf
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
# -------------------- -------------------- |
|
da9ddef602cf
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
# |
|
da9ddef602cf
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 |
|
da9ddef602cf
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@' |
|
da9ddef602cf
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@}
|
|
da9ddef602cf
15771644 SUNBT7143713 RFE: allow multiple Apache 2.2 instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
# |
|
da9ddef602cf
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 |
|
da9ddef602cf
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 |