| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Wed, 18 Sep 2013 06:33:33 -0700 | |
| branch | s11-update |
| changeset 2763 | 3d6d26aa4a1c |
| permissions | -rw-r--r-- |
|
2763
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
https://issues.apache.org/bugzilla/show_bug.cgi?id=54719 |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
|
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
--- server/main.c |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
+++ server/main.c |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
@@ -675,6 +675,21 @@ int main(int argc, const char * const ar |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
} |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
} |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
|
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
+ /* Unless started with non-default configuration file we will ensure that |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
+ * run time directory exists. This is required by systems where run time |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
+ * directory is on non-reboot persistent file system). |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
+ */ |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+ if (strcmp(confname, SERVER_CONFIG_FILE) == 0) {
|
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ rv = apr_dir_make_recursive(DEFAULT_REL_RUNTIMEDIR, |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+ APR_OS_DEFAULT, pconf); |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+ if (rv != APR_SUCCESS) {
|
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+ ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR, |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+ 0, NULL, "could not create runtime directory: %s", |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ DEFAULT_REL_RUNTIMEDIR); |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
+ destroy_and_exit_process(process, 1); |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+ } |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
+ } |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
+ |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
apr_pool_clear(plog); |
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
|
|
3d6d26aa4a1c
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
if ( ap_run_open_logs(pconf, plog, ptemp, server_conf) != OK) {
|