From ada16d3e918f2f490115ed7932461c8a27a86077 Mon Sep 17 00:00:00 2001 From: brenosilva Date: Thu, 23 Aug 2012 01:35:44 +0000 Subject: [PATCH] Fix compilation issues in server.c. Looks like unixd_config is different in apache major and minor versions --- standalone/server.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/standalone/server.c b/standalone/server.c index 083f6177..b53410f5 100644 --- a/standalone/server.c +++ b/standalone/server.c @@ -830,7 +830,7 @@ AP_DECLARE(void) ap_add_common_vars(request_rec *r) #ifndef WIN32 -unixd_config_rec unixd_config = { NULL, 0, 0, 0, NULL }; +unixd_config_rec unixd_config; const char *ap_server_argv0 = "nginx"; #ifdef HAVE_GETPWNAM @@ -876,8 +876,7 @@ AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp) unixd_config.user_name = DEFAULT_USER; unixd_config.user_id = ap_uname2id(DEFAULT_USER); unixd_config.group_id = ap_gname2id(DEFAULT_GROUP); - - unixd_config.chroot_dir = NULL; /* none */ + //unixd_config.chroot_dir = NULL; /* none */ /* Check for suexec */ unixd_config.suexec_enabled = 0;