15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f s11-update
authorPetr Sumbera <petr.sumbera@oracle.com>
Wed, 18 Sep 2013 06:33:33 -0700
branchs11-update
changeset 2763 3d6d26aa4a1c
parent 2760 d8617e86d47d
child 2764 8113f7cca140
15648359 SUNBT6959303 Cannot start Solaris Apache 2 and 2.2 via httpd -f
components/apache2/patches/apachectl.patch
components/apache2/patches/bug54719.patch
--- a/components/apache2/patches/apachectl.patch	Wed Sep 11 09:47:05 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- support/apachectl.in.orig	Tue Jul 11 20:38:44 2006
-+++ support/apachectl.in	Tue Feb 12 02:24:17 2008
[email protected]@ -75,6 +75,12 @@
-     ARGV="-h"
- fi
- 
-+if [ ! -d "@[email protected]" ]; then
-+    mkdir -p @[email protected]
-+    chown -R webservd @[email protected]
-+    chgrp -R webservd @[email protected]
-+fi
-+
- case $ARGV in
- start|stop|restart|graceful|graceful-stop)
-     $HTTPD -k $ARGV
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2/patches/bug54719.patch	Wed Sep 18 06:33:33 2013 -0700
@@ -0,0 +1,26 @@
+https://issues.apache.org/bugzilla/show_bug.cgi?id=54719
+
+--- server/main.c
++++ server/main.c
[email protected]@ -675,6 +675,21 @@ int main(int argc, const char * const ar
+         }
+     }
+ 
++    /* Unless started with non-default configuration file we will ensure that
++     * run time directory exists. This is required by systems where run time
++     * directory is on non-reboot persistent file system).
++     */
++    if (strcmp(confname, SERVER_CONFIG_FILE) == 0) {
++        rv = apr_dir_make_recursive(DEFAULT_REL_RUNTIMEDIR,
++                                    APR_OS_DEFAULT, pconf);
++        if (rv != APR_SUCCESS) {
++            ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR,
++                         0, NULL, "could not create runtime directory: %s",
++                         DEFAULT_REL_RUNTIMEDIR);
++            destroy_and_exit_process(process, 1);
++        }
++    }
++
+     apr_pool_clear(plog);
+ 
+     if ( ap_run_open_logs(pconf, plog, ptemp, server_conf) != OK) {