| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Thu, 11 Sep 2014 12:35:18 -0700 | |
| changeset 2079 | 46ce7840065c |
| parent 1354 | components/apache2/patches/bug54719.patch@b0dd55c38340 |
| child 6502 | 568ea88798fa |
| permissions | -rw-r--r-- |
|
2079
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1354
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:
1354
diff
changeset
|
2 |
Patch status: submitted to community |
|
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1354
diff
changeset
|
3 |
|
|
1354
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
https://issues.apache.org/bugzilla/show_bug.cgi?id=54719 |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
--- server/main.c |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+++ server/main.c |
|
2079
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1354
diff
changeset
|
8 |
@@ -685,6 +688,21 @@ |
|
1354
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
} |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
} |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
|
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
+ /* Unless started with non-default configuration file we will ensure that |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+ * run time directory exists. This is required by systems where run time |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ * directory is on non-reboot persistent file system). |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+ */ |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+ if (strcmp(confname, SERVER_CONFIG_FILE) == 0) {
|
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+ rv = apr_dir_make_recursive(DEFAULT_REL_RUNTIMEDIR, |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+ APR_OS_DEFAULT, pconf); |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ if (rv != APR_SUCCESS) {
|
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
+ ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR, |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+ 0, NULL, "could not create runtime directory: %s", |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
+ DEFAULT_REL_RUNTIMEDIR); |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
+ destroy_and_exit_process(process, 1); |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
+ } |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
+ } |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
+ |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
apr_pool_clear(plog); |
|
b0dd55c38340
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
|
|
2079
46ce7840065c
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
1354
diff
changeset
|
29 |
if ( ap_run_open_logs(pconf, plog, ptemp, ap_server_conf) != OK) {
|