diff --git a/apache2-implicit-pointer-decl.patch b/apache2-implicit-pointer-decl.patch index ea8a771..27e4db8 100644 --- a/apache2-implicit-pointer-decl.patch +++ b/apache2-implicit-pointer-decl.patch @@ -1,5 +1,5 @@ ---- httpd-2.4.4.orig/server/request.c -+++ httpd-2.4.4/server/request.c +--- httpd-2.4.6.orig/server/request.c ++++ httpd-2.4.6/server/request.c @@ -46,10 +46,13 @@ #include "util_script.h" #include "ap_expr.h" @@ -15,8 +15,8 @@ #if APR_HAVE_STDARG_H #include #endif ---- httpd-2.4.4.orig/server/config.c -+++ httpd-2.4.4/server/config.c +--- httpd-2.4.6.orig/server/config.c ++++ httpd-2.4.6/server/config.c @@ -48,10 +48,14 @@ #include "http_request.h" /* for default_handler (see invoke_handler) */ #include "http_main.h" diff --git a/apache2.4-mpm-itk-2.4.2-01.patch b/apache2.4-mpm-itk-2.4.2-01.patch deleted file mode 100644 index ba21410..0000000 --- a/apache2.4-mpm-itk-2.4.2-01.patch +++ /dev/null @@ -1,2159 +0,0 @@ -Index: httpd-2.4.2/server/mpm/itk/Makefile.in -=================================================================== ---- /dev/null -+++ httpd-2.4.2/server/mpm/itk/Makefile.in -@@ -0,0 +1 @@ -+include $(top_srcdir)/build/special.mk -Index: httpd-2.4.2/server/mpm/itk/config.m4 -=================================================================== ---- /dev/null -+++ httpd-2.4.2/server/mpm/itk/config.m4 -@@ -0,0 +1,7 @@ -+AC_MSG_CHECKING(if itk MPM supports this platform) -+if test $forking_mpms_supported != yes; then -+ AC_MSG_RESULT(no - This is not a forking platform) -+else -+ AC_MSG_RESULT(yes) -+ APACHE_MPM_SUPPORTED(itk, yes, no) -+fi -Index: httpd-2.4.2/server/mpm/itk/config3.m4 -=================================================================== ---- /dev/null -+++ httpd-2.4.2/server/mpm/itk/config3.m4 -@@ -0,0 +1 @@ -+APACHE_MPM_MODULE(itk, $enable_mpm_itk) -Index: httpd-2.4.2/server/mpm/itk/itk.c -=================================================================== ---- /dev/null -+++ httpd-2.4.2/server/mpm/itk/itk.c -@@ -0,0 +1,1917 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ * Portions copyright 2005-2012 Steinar H. Gunderson . -+ * Licensed under the same terms as the rest of Apache. -+ * -+ * Portions copyright 2008 Knut Auvor Grythe . -+ * Licensed under the same terms as the rest of Apache. -+ */ -+ -+#include "apr.h" -+#include "apr_portable.h" -+#include "apr_strings.h" -+#include "apr_thread_proc.h" -+#include "apr_signal.h" -+ -+# define _DBG(text,par...) \ -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, \ -+ "(itkmpm: pid=%d uid=%d, gid=%d) %s(): " text, \ -+ getpid(), getuid(), getgid(), __FUNCTION__, par) -+ -+#define APR_WANT_STDIO -+#define APR_WANT_STRFUNC -+#include "apr_want.h" -+ -+#if APR_HAVE_UNISTD_H -+#include -+#endif -+#if APR_HAVE_SYS_TYPES_H -+#include -+#endif -+#include -+#include -+ -+#include "ap_config.h" -+#include "httpd.h" -+#include "mpm_default.h" -+#include "http_main.h" -+#include "http_log.h" -+#include "http_config.h" -+#include "http_core.h" /* for get_remote_host */ -+#include "http_connection.h" -+#include "scoreboard.h" -+#include "ap_mpm.h" -+#include "util_mutex.h" -+#include "unixd.h" -+#include "mpm_common.h" -+#include "ap_listen.h" -+#include "ap_mmn.h" -+#include "apr_poll.h" -+#include "ap_expr.h" -+ -+#ifdef HAVE_TIME_H -+#include -+#endif -+#ifdef HAVE_SYS_PROCESSOR_H -+#include /* for bindprocessor() */ -+#endif -+ -+#if HAVE_LIBCAP -+#include -+#endif -+ -+#include -+#include -+ -+/* Import our private hook. */ -+AP_DECLARE_HOOK(int,post_perdir_config,(request_rec *r)) -+ -+/* Limit on the total --- clients will be locked out if more servers than -+ * this are needed. It is intended solely to keep the server from crashing -+ * when things get out of hand. -+ * -+ * We keep a hard maximum number of servers, for two reasons --- first off, -+ * in case something goes seriously wrong, we want to stop the fork bomb -+ * short of actually crashing the machine we're running on by filling some -+ * kernel table. Secondly, it keeps the size of the scoreboard file small -+ * enough that we can read the whole thing without worrying too much about -+ * the overhead. -+ */ -+#ifndef DEFAULT_SERVER_LIMIT -+#define DEFAULT_SERVER_LIMIT 256 -+#endif -+ -+/* Admin can't tune ServerLimit beyond MAX_SERVER_LIMIT. We want -+ * some sort of compile-time limit to help catch typos. -+ */ -+#ifndef MAX_SERVER_LIMIT -+#define MAX_SERVER_LIMIT 200000 -+#endif -+ -+#ifndef HARD_THREAD_LIMIT -+#define HARD_THREAD_LIMIT 1 -+#endif -+ -+/* config globals */ -+ -+static apr_proc_mutex_t *accept_mutex; -+static int ap_daemons_to_start=0; -+static int ap_daemons_min_free=0; -+static int ap_daemons_max_free=0; -+static int ap_daemons_limit=0; /* MaxRequestWorkers */ -+static int server_limit = 0; -+static int mpm_state = AP_MPMQ_STARTING; -+static ap_pod_t *pod; -+ -+/* data retained by itk across load/unload of the module -+ * allocated on first call to pre-config hook; located on -+ * subsequent calls to pre-config hook -+ */ -+typedef struct itk_retained_data { -+ int first_server_limit; -+ int module_loads; -+ ap_generation_t my_generation; -+ int volatile is_graceful; /* set from signal handler */ -+ int maxclients_reported; -+ /* -+ * The max child slot ever assigned, preserved across restarts. Necessary -+ * to deal with MaxRequestWorkers changes across AP_SIG_GRACEFUL restarts. We -+ * use this value to optimize routines that have to scan the entire scoreboard. -+ */ -+ int max_daemons_limit; -+ /* -+ * idle_spawn_rate is the number of children that will be spawned on the -+ * next maintenance cycle if there aren't enough idle servers. It is -+ * doubled up to MAX_SPAWN_RATE, and reset only when a cycle goes by -+ * without the need to spawn. -+ */ -+ int idle_spawn_rate; -+#ifndef MAX_SPAWN_RATE -+#define MAX_SPAWN_RATE (32) -+#endif -+ int hold_off_on_exponential_spawning; -+} itk_retained_data; -+static itk_retained_data *retained; -+ -+#define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid) -+ -+/* one_process --- debugging mode variable; can be set from the command line -+ * with the -X flag. If set, this gets you the child_main loop running -+ * in the process which originally started up (no detach, no make_child), -+ * which is a pretty nice debugging environment. (You'll get a SIGHUP -+ * early in standalone_main; just continue through. This is the server -+ * trying to kill off any child processes which it might have lying -+ * around --- Apache doesn't keep track of their pids, it just sends -+ * SIGHUP to the process group, ignoring it in the root process. -+ * Continue through and you'll be fine.). -+ */ -+ -+static int one_process = 0; -+ -+static apr_pool_t *pconf; /* Pool for config stuff */ -+static apr_pool_t *pchild; /* Pool for httpd child stuff */ -+ -+static pid_t ap_my_pid; /* it seems silly to call getpid all the time */ -+static pid_t parent_pid; -+static int my_child_num; -+ -+#define UNSET_NICE_VALUE 100 -+ -+typedef struct -+{ -+ uid_t uid; -+ gid_t gid; -+ char *username; -+ int nice_value; -+ ap_expr_info_t *uid_expr; -+ ap_expr_info_t *gid_expr; -+} itk_per_dir_conf; -+ -+typedef struct -+{ -+ int max_clients_vhost; -+} itk_server_conf; -+ -+module AP_MODULE_DECLARE_DATA mpm_itk_module; -+extern AP_DECLARE_DATA int ap_running_under_mpm_itk; -+ -+#ifdef GPROF -+/* -+ * change directory for gprof to plop the gmon.out file -+ * configure in httpd.conf: -+ * GprofDir $RuntimeDir/ -> $ServerRoot/$RuntimeDir/gmon.out -+ * GprofDir $RuntimeDir/% -> $ServerRoot/$RuntimeDir/gprof.$pid/gmon.out -+ */ -+static void chdir_for_gprof(void) -+{ -+ core_server_config *sconf = -+ ap_get_core_module_config(ap_server_conf->module_config); -+ char *dir = sconf->gprof_dir; -+ const char *use_dir; -+ -+ if(dir) { -+ apr_status_t res; -+ char *buf = NULL ; -+ int len = strlen(sconf->gprof_dir) - 1; -+ if(*(dir + len) == '%') { -+ dir[len] = '\0'; -+ buf = ap_append_pid(pconf, dir, "gprof."); -+ } -+ use_dir = ap_server_root_relative(pconf, buf ? buf : dir); -+ res = apr_dir_make(use_dir, -+ APR_UREAD | APR_UWRITE | APR_UEXECUTE | -+ APR_GREAD | APR_GEXECUTE | -+ APR_WREAD | APR_WEXECUTE, pconf); -+ if(res != APR_SUCCESS && !APR_STATUS_IS_EEXIST(res)) { -+ ap_log_error(APLOG_MARK, APLOG_ERR, res, ap_server_conf, APLOGNO(00142) -+ "gprof: error creating directory %s", dir); -+ } -+ } -+ else { -+ use_dir = ap_server_root_relative(pconf, DEFAULT_REL_RUNTIMEDIR); -+ } -+ -+ chdir(use_dir); -+} -+#else -+#define chdir_for_gprof() -+#endif -+ -+static void itk_note_child_killed(int childnum, pid_t pid, -+ ap_generation_t gen) -+{ -+ AP_DEBUG_ASSERT(childnum != -1); /* no scoreboard squatting with this MPM */ -+ ap_run_child_status(ap_server_conf, -+ ap_scoreboard_image->parent[childnum].pid, -+ ap_scoreboard_image->parent[childnum].generation, -+ childnum, MPM_CHILD_EXITED); -+ ap_scoreboard_image->parent[childnum].pid = 0; -+} -+ -+static void itk_note_child_started(int slot, pid_t pid) -+{ -+ ap_scoreboard_image->parent[slot].pid = pid; -+ ap_run_child_status(ap_server_conf, -+ ap_scoreboard_image->parent[slot].pid, -+ retained->my_generation, slot, MPM_CHILD_STARTED); -+} -+ -+/* a clean exit from a child with proper cleanup */ -+static void clean_child_exit(int code) __attribute__ ((noreturn)); -+static void clean_child_exit(int code) -+{ -+ mpm_state = AP_MPMQ_STOPPING; -+ -+ if (pchild) { -+ apr_pool_destroy(pchild); -+ } -+ -+ if (one_process) { -+ itk_note_child_killed(/* slot */ 0, 0, 0); -+ } -+ -+ ap_mpm_pod_close(pod); -+ chdir_for_gprof(); -+ exit(code); -+} -+ -+static void accept_mutex_on(void) -+{ -+ apr_status_t rv = apr_proc_mutex_lock(accept_mutex); -+ if (rv != APR_SUCCESS) { -+ const char *msg = "couldn't grab the accept mutex"; -+ -+ if (retained->my_generation != -+ ap_scoreboard_image->global->running_generation) { -+ ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, ap_server_conf, APLOGNO(00143) "%s", msg); -+ clean_child_exit(0); -+ } -+ else { -+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, APLOGNO(00144) "%s", msg); -+ exit(APEXIT_CHILDFATAL); -+ } -+ } -+} -+ -+static void accept_mutex_off(void) -+{ -+ apr_status_t rv = apr_proc_mutex_unlock(accept_mutex); -+ if (rv != APR_SUCCESS) { -+ const char *msg = "couldn't release the accept mutex"; -+ -+ if (retained->my_generation != -+ ap_scoreboard_image->global->running_generation) { -+ ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, ap_server_conf, APLOGNO(00145) "%s", msg); -+ /* don't exit here... we have a connection to -+ * process, after which point we'll see that the -+ * generation changed and we'll exit cleanly -+ */ -+ } -+ else { -+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, APLOGNO(00146) "%s", msg); -+ exit(APEXIT_CHILDFATAL); -+ } -+ } -+} -+ -+/* On some architectures it's safe to do unserialized accept()s in the single -+ * Listen case. But it's never safe to do it in the case where there's -+ * multiple Listen statements. Define SINGLE_LISTEN_UNSERIALIZED_ACCEPT -+ * when it's safe in the single Listen case. -+ */ -+#ifdef SINGLE_LISTEN_UNSERIALIZED_ACCEPT -+#define SAFE_ACCEPT(stmt) do {if (ap_listeners->next) {stmt;}} while(0) -+#else -+#define SAFE_ACCEPT(stmt) do {stmt;} while(0) -+#endif -+ -+static int itk_query(int query_code, int *result, apr_status_t *rv) -+{ -+ *rv = APR_SUCCESS; -+ switch(query_code){ -+ case AP_MPMQ_MAX_DAEMON_USED: -+ *result = ap_daemons_limit; -+ break; -+ case AP_MPMQ_IS_THREADED: -+ *result = AP_MPMQ_NOT_SUPPORTED; -+ break; -+ case AP_MPMQ_IS_FORKED: -+ *result = AP_MPMQ_DYNAMIC; -+ break; -+ case AP_MPMQ_HARD_LIMIT_DAEMONS: -+ *result = server_limit; -+ break; -+ case AP_MPMQ_HARD_LIMIT_THREADS: -+ *result = HARD_THREAD_LIMIT; -+ break; -+ case AP_MPMQ_MAX_THREADS: -+ *result = 1; -+ break; -+ case AP_MPMQ_MIN_SPARE_DAEMONS: -+ *result = ap_daemons_min_free; -+ break; -+ case AP_MPMQ_MIN_SPARE_THREADS: -+ *result = 0; -+ break; -+ case AP_MPMQ_MAX_SPARE_DAEMONS: -+ *result = ap_daemons_max_free; -+ break; -+ case AP_MPMQ_MAX_SPARE_THREADS: -+ *result = 0; -+ break; -+ case AP_MPMQ_MAX_REQUESTS_DAEMON: -+ *result = ap_max_requests_per_child; -+ break; -+ case AP_MPMQ_MAX_DAEMONS: -+ *result = ap_daemons_limit; -+ break; -+ case AP_MPMQ_MPM_STATE: -+ *result = mpm_state; -+ break; -+ case AP_MPMQ_GENERATION: -+ *result = retained->my_generation; -+ break; -+ default: -+ *rv = APR_ENOTIMPL; -+ break; -+ } -+ return OK; -+} -+ -+static const char *itk_get_name(void) -+{ -+ return "itk"; -+} -+ -+/***************************************************************** -+ * Connection structures and accounting... -+ */ -+ -+static void just_die(int sig) -+{ -+ clean_child_exit(0); -+} -+ -+/* volatile because they're updated from a signal handler */ -+static int volatile shutdown_pending; -+static int volatile restart_pending; -+static int volatile die_now = 0; -+ -+static void stop_listening(int sig) -+{ -+ mpm_state = AP_MPMQ_STOPPING; -+ ap_close_listeners(); -+ -+ /* For a graceful stop, we want the child to exit when done */ -+ die_now = 1; -+} -+ -+static void sig_term(int sig) -+{ -+ if (shutdown_pending == 1) { -+ /* Um, is this _probably_ not an error, if the user has -+ * tried to do a shutdown twice quickly, so we won't -+ * worry about reporting it. -+ */ -+ return; -+ } -+ mpm_state = AP_MPMQ_STOPPING; -+ shutdown_pending = 1; -+ retained->is_graceful = (sig == AP_SIG_GRACEFUL_STOP); -+} -+ -+/* restart() is the signal handler for SIGHUP and AP_SIG_GRACEFUL -+ * in the parent process, unless running in ONE_PROCESS mode -+ */ -+static void restart(int sig) -+{ -+ if (restart_pending == 1) { -+ /* Probably not an error - don't bother reporting it */ -+ return; -+ } -+ mpm_state = AP_MPMQ_STOPPING; -+ restart_pending = 1; -+ retained->is_graceful = (sig == AP_SIG_GRACEFUL); -+} -+ -+static void set_signals(void) -+{ -+#ifndef NO_USE_SIGACTION -+ struct sigaction sa; -+#endif -+ -+ if (!one_process) { -+ ap_fatal_signal_setup(ap_server_conf, pconf); -+ } -+ -+#ifndef NO_USE_SIGACTION -+ sigemptyset(&sa.sa_mask); -+ sa.sa_flags = 0; -+ -+ sa.sa_handler = sig_term; -+ if (sigaction(SIGTERM, &sa, NULL) < 0) -+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00147) "sigaction(SIGTERM)"); -+#ifdef AP_SIG_GRACEFUL_STOP -+ if (sigaction(AP_SIG_GRACEFUL_STOP, &sa, NULL) < 0) -+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00148) -+ "sigaction(" AP_SIG_GRACEFUL_STOP_STRING ")"); -+#endif -+#ifdef SIGINT -+ if (sigaction(SIGINT, &sa, NULL) < 0) -+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00149) "sigaction(SIGINT)"); -+#endif -+#ifdef SIGXCPU -+ sa.sa_handler = SIG_DFL; -+ if (sigaction(SIGXCPU, &sa, NULL) < 0) -+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00150) "sigaction(SIGXCPU)"); -+#endif -+#ifdef SIGXFSZ -+ /* For systems following the LFS standard, ignoring SIGXFSZ allows -+ * a write() beyond the 2GB limit to fail gracefully with E2BIG -+ * rather than terminate the process. */ -+ sa.sa_handler = SIG_IGN; -+ if (sigaction(SIGXFSZ, &sa, NULL) < 0) -+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00151) "sigaction(SIGXFSZ)"); -+#endif -+#ifdef SIGPIPE -+ sa.sa_handler = SIG_IGN; -+ if (sigaction(SIGPIPE, &sa, NULL) < 0) -+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00152) "sigaction(SIGPIPE)"); -+#endif -+ -+ /* we want to ignore HUPs and AP_SIG_GRACEFUL while we're busy -+ * processing one -+ */ -+ sigaddset(&sa.sa_mask, SIGHUP); -+ sigaddset(&sa.sa_mask, AP_SIG_GRACEFUL); -+ sa.sa_handler = restart; -+ if (sigaction(SIGHUP, &sa, NULL) < 0) -+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00153) "sigaction(SIGHUP)"); -+ if (sigaction(AP_SIG_GRACEFUL, &sa, NULL) < 0) -+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00154) "sigaction(" AP_SIG_GRACEFUL_STRING ")"); -+#else -+ if (!one_process) { -+#ifdef SIGXCPU -+ apr_signal(SIGXCPU, SIG_DFL); -+#endif /* SIGXCPU */ -+#ifdef SIGXFSZ -+ apr_signal(SIGXFSZ, SIG_IGN); -+#endif /* SIGXFSZ */ -+ } -+ -+ apr_signal(SIGTERM, sig_term); -+#ifdef SIGHUP -+ apr_signal(SIGHUP, restart); -+#endif /* SIGHUP */ -+#ifdef AP_SIG_GRACEFUL -+ apr_signal(AP_SIG_GRACEFUL, restart); -+#endif /* AP_SIG_GRACEFUL */ -+#ifdef AP_SIG_GRACEFUL_STOP -+ apr_signal(AP_SIG_GRACEFUL_STOP, sig_term); -+#endif /* AP_SIG_GRACEFUL */ -+#ifdef SIGPIPE -+ apr_signal(SIGPIPE, SIG_IGN); -+#endif /* SIGPIPE */ -+ -+#endif -+} -+ -+/***************************************************************** -+ * Child process main loop. -+ * The following vars are static to avoid getting clobbered by longjmp(); -+ * they are really private to child_main. -+ */ -+ -+static int requests_this_child; -+static int num_listensocks = 0; -+ -+static void child_main(int child_num_arg) -+{ -+#if APR_HAS_THREADS -+ apr_thread_t *thd = NULL; -+ apr_os_thread_t osthd; -+#endif -+ apr_pool_t *ptrans; -+ apr_allocator_t *allocator; -+ apr_status_t status; -+ int i; -+ ap_listen_rec *lr; -+ apr_pollset_t *pollset; -+ ap_sb_handle_t *sbh; -+ apr_bucket_alloc_t *bucket_alloc; -+ int last_poll_idx = 0; -+ const char *lockfile; -+ -+#if HAVE_LIBCAP -+ cap_t caps; -+ cap_value_t suidcaps[] = { -+ CAP_SETUID, -+ CAP_SETGID, -+ CAP_DAC_READ_SEARCH, -+ CAP_SYS_NICE, -+ }; -+#endif -+ -+ mpm_state = AP_MPMQ_STARTING; /* for benefit of any hooks that run as this -+ * child initializes -+ */ -+ -+ ap_running_under_mpm_itk = 1; -+ my_child_num = child_num_arg; -+ ap_my_pid = getpid(); -+ requests_this_child = 0; -+ -+ ap_fatal_signal_child_setup(ap_server_conf); -+ -+ /* Get a sub context for global allocations in this child, so that -+ * we can have cleanups occur when the child exits. -+ */ -+ apr_allocator_create(&allocator); -+ apr_allocator_max_free_set(allocator, ap_max_mem_free); -+ apr_pool_create_ex(&pchild, pconf, NULL, allocator); -+ apr_allocator_owner_set(allocator, pchild); -+ apr_pool_tag(pchild, "pchild"); -+ -+#if APR_HAS_THREADS -+ osthd = apr_os_thread_current(); -+ apr_os_thread_put(&thd, &osthd, pchild); -+#endif -+ -+ apr_pool_create(&ptrans, pchild); -+ apr_pool_tag(ptrans, "transaction"); -+ -+ /* needs to be done before we switch UIDs so we have permissions */ -+ ap_reopen_scoreboard(pchild, NULL, 0); -+ lockfile = apr_proc_mutex_lockfile(accept_mutex); -+ status = apr_proc_mutex_child_init(&accept_mutex, -+ lockfile, -+ pchild); -+ if (status != APR_SUCCESS) { -+ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00155) -+ "Couldn't initialize cross-process lock in child " -+ "(%s) (%s)", -+ lockfile ? lockfile : "none", -+ apr_proc_mutex_name(accept_mutex)); -+ clean_child_exit(APEXIT_CHILDFATAL); -+ } -+ -+ ap_run_child_init(pchild, ap_server_conf); -+ -+ ap_create_sb_handle(&sbh, pchild, my_child_num, 0); -+ -+ (void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL); -+ -+ /* Set up the pollfd array */ -+ status = apr_pollset_create(&pollset, num_listensocks, pchild, 0); -+ if (status != APR_SUCCESS) { -+ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00156) -+ "Couldn't create pollset in child; check system or user limits"); -+ clean_child_exit(APEXIT_CHILDSICK); /* assume temporary resource issue */ -+ } -+ -+ for (lr = ap_listeners, i = num_listensocks; i--; lr = lr->next) { -+ apr_pollfd_t pfd = { 0 }; -+ -+ pfd.desc_type = APR_POLL_SOCKET; -+ pfd.desc.s = lr->sd; -+ pfd.reqevents = APR_POLLIN; -+ pfd.client_data = lr; -+ -+ status = apr_pollset_add(pollset, &pfd); -+ if (status != APR_SUCCESS) { -+ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00157) -+ "Couldn't add listener to pollset; check system or user limits"); -+ clean_child_exit(APEXIT_CHILDSICK); -+ } -+ -+ lr->accept_func = ap_unixd_accept; -+ } -+ -+#if HAVE_LIBCAP -+ /* Drop as many privileges as we can. We'll still -+ * access files with uid=0, and we can setuid() to anything, but -+ * at least there's tons of other evilness (like loading kernel -+ * modules) we can't do directly. (The setuid() capability will -+ * go away automatically when we setuid() or exec() -- the former -+ * is likely to come first.) -+ */ -+ caps = cap_init(); -+ cap_clear(caps); -+ cap_set_flag(caps, CAP_PERMITTED, sizeof(suidcaps)/sizeof(cap_value_t), suidcaps, CAP_SET); -+ cap_set_flag(caps, CAP_EFFECTIVE, sizeof(suidcaps)/sizeof(cap_value_t), suidcaps, CAP_SET); -+ cap_set_proc(caps); -+ cap_free(caps); -+#endif -+ -+ mpm_state = AP_MPMQ_RUNNING; -+ -+ bucket_alloc = apr_bucket_alloc_create(pchild); -+ -+ /* die_now is set when AP_SIG_GRACEFUL is received in the child; -+ * shutdown_pending is set when SIGTERM is received when running -+ * in single process mode. */ -+ while (!die_now && !shutdown_pending) { -+ conn_rec *current_conn; -+ void *csd; -+ -+ /* -+ * (Re)initialize this child to a pre-connection state. -+ */ -+ -+ apr_pool_clear(ptrans); -+ -+ if ((ap_max_requests_per_child > 0 -+ && requests_this_child++ >= ap_max_requests_per_child)) { -+ clean_child_exit(0); -+ } -+ -+ (void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL); -+ -+ /* -+ * Wait for an acceptable connection to arrive. -+ */ -+ -+ /* Lock around "accept", if necessary */ -+ SAFE_ACCEPT(accept_mutex_on()); -+ -+ if (num_listensocks == 1) { -+ /* There is only one listener record, so refer to that one. */ -+ lr = ap_listeners; -+ } -+ else { -+ /* multiple listening sockets - need to poll */ -+ for (;;) { -+ apr_int32_t numdesc; -+ const apr_pollfd_t *pdesc; -+ -+ /* check for termination first so we don't sleep for a while in -+ * poll if already signalled -+ */ -+ if (die_now /* in graceful stop/restart */ -+ || (one_process && shutdown_pending)) { -+ SAFE_ACCEPT(accept_mutex_off()); -+ clean_child_exit(0); -+ } -+ -+ /* timeout == 10 seconds to avoid a hang at graceful restart/stop -+ * caused by the closing of sockets by the signal handler -+ */ -+ status = apr_pollset_poll(pollset, apr_time_from_sec(10), -+ &numdesc, &pdesc); -+ if (status != APR_SUCCESS) { -+ if (APR_STATUS_IS_TIMEUP(status) || -+ APR_STATUS_IS_EINTR(status)) { -+ continue; -+ } -+ /* Single Unix documents select as returning errnos -+ * EBADF, EINTR, and EINVAL... and in none of those -+ * cases does it make sense to continue. In fact -+ * on Linux 2.0.x we seem to end up with EFAULT -+ * occasionally, and we'd loop forever due to it. -+ */ -+ ap_log_error(APLOG_MARK, APLOG_ERR, status, -+ ap_server_conf, APLOGNO(00158) "apr_pollset_poll: (listen)"); -+ SAFE_ACCEPT(accept_mutex_off()); -+ clean_child_exit(1); -+ } -+ -+ /* We can always use pdesc[0], but sockets at position N -+ * could end up completely starved of attention in a very -+ * busy server. Therefore, we round-robin across the -+ * returned set of descriptors. While it is possible that -+ * the returned set of descriptors might flip around and -+ * continue to starve some sockets, we happen to know the -+ * internal pollset implementation retains ordering -+ * stability of the sockets. Thus, the round-robin should -+ * ensure that a socket will eventually be serviced. -+ */ -+ if (last_poll_idx >= numdesc) -+ last_poll_idx = 0; -+ -+ /* Grab a listener record from the client_data of the poll -+ * descriptor, and advance our saved index to round-robin -+ * the next fetch. -+ * -+ * ### hmm... this descriptor might have POLLERR rather -+ * ### than POLLIN -+ */ -+ lr = pdesc[last_poll_idx++].client_data; -+ goto got_fd; -+ } -+ } -+ got_fd: -+ /* if we accept() something we don't want to die, so we have to -+ * defer the exit -+ */ -+ status = lr->accept_func(&csd, lr, ptrans); -+ -+ SAFE_ACCEPT(accept_mutex_off()); /* unlock after "accept" */ -+ -+ if (status == APR_EGENERAL) { -+ /* resource shortage or should-not-occur occured */ -+ clean_child_exit(1); -+ } -+ else if (status != APR_SUCCESS) { -+ continue; -+ } -+ -+ /* -+ * We now have a connection, so set it up with the appropriate -+ * socket options, file descriptors, and read/write buffers. -+ */ -+ -+ { -+ pid_t pid = fork(), child_pid; -+ int status; -+ switch (pid) { -+ case -1: -+ ap_log_error(APLOG_MARK, APLOG_ERR, errno, NULL, "fork: Unable to fork new process"); -+ break; -+ case 0: /* child */ -+ current_conn = ap_run_create_connection(ptrans, ap_server_conf, csd, my_child_num, sbh, bucket_alloc); -+ if (current_conn) { -+#if APR_HAS_THREADS -+ current_conn->current_thread = thd; -+#endif -+ ap_process_connection(current_conn, csd); -+ ap_lingering_close(current_conn); -+ } -+ clean_child_exit(0); -+ default: /* parent; just wait for child to be done */ -+ do { -+ child_pid = waitpid(pid, &status, 0); -+ } while (child_pid == -1 && errno == EINTR); -+ -+ if (child_pid != pid || !WIFEXITED(status)) { -+ if (WIFSIGNALED(status)) { -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, "child died with signal %u", WTERMSIG(status)); -+ } else if (WEXITSTATUS(status) != 0) { -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, "child exited with non-zero exit status %u", WEXITSTATUS(status)); -+ } else { -+ ap_log_error(APLOG_MARK, APLOG_ERR, errno, NULL, "waitpid() failed"); -+ } -+ clean_child_exit(1); -+ } -+ break; -+ } -+ } -+ -+ /* Check the pod and the generation number after processing a -+ * connection so that we'll go away if a graceful restart occurred -+ * while we were processing the connection or we are the lucky -+ * idle server process that gets to die. -+ */ -+ if (ap_mpm_pod_check(pod) == APR_SUCCESS) { /* selected as idle? */ -+ die_now = 1; -+ } -+ else if (retained->my_generation != -+ ap_scoreboard_image->global->running_generation) { /* restart? */ -+ /* yeah, this could be non-graceful restart, in which case the -+ * parent will kill us soon enough, but why bother checking? -+ */ -+ die_now = 1; -+ } -+ -+ /* if we have already setuid(), die (we can't be used anyhow) */ -+ if (getuid()) -+ die_now = 1; -+ } -+ apr_pool_clear(ptrans); /* kludge to avoid crash in APR reslist cleanup code */ -+ clean_child_exit(0); -+} -+ -+ -+static int make_child(server_rec *s, int slot) -+{ -+ int pid; -+ -+ if (slot + 1 > retained->max_daemons_limit) { -+ retained->max_daemons_limit = slot + 1; -+ } -+ -+ if (one_process) { -+ apr_signal(SIGHUP, sig_term); -+ /* Don't catch AP_SIG_GRACEFUL in ONE_PROCESS mode :) */ -+ apr_signal(SIGINT, sig_term); -+#ifdef SIGQUIT -+ apr_signal(SIGQUIT, SIG_DFL); -+#endif -+ apr_signal(SIGTERM, sig_term); -+ itk_note_child_started(slot, getpid()); -+ child_main(slot); -+ /* NOTREACHED */ -+ } -+ -+ (void) ap_update_child_status_from_indexes(slot, 0, SERVER_STARTING, -+ (request_rec *) NULL); -+ -+ -+#ifdef _OSD_POSIX -+ /* BS2000 requires a "special" version of fork() before a setuid() call */ -+ if ((pid = os_fork(ap_unixd_config.user_name)) == -1) { -+#else -+ if ((pid = fork()) == -1) { -+#endif -+ ap_log_error(APLOG_MARK, APLOG_ERR, errno, s, APLOGNO(00159) "fork: Unable to fork new process"); -+ -+ /* fork didn't succeed. Fix the scoreboard or else -+ * it will say SERVER_STARTING forever and ever -+ */ -+ (void) ap_update_child_status_from_indexes(slot, 0, SERVER_DEAD, -+ (request_rec *) NULL); -+ -+ /* In case system resources are maxxed out, we don't want -+ * Apache running away with the CPU trying to fork over and -+ * over and over again. -+ */ -+ sleep(10); -+ -+ return -1; -+ } -+ -+ if (!pid) { -+#ifdef HAVE_BINDPROCESSOR -+ /* by default AIX binds to a single processor -+ * this bit unbinds children which will then bind to another cpu -+ */ -+ int status = bindprocessor(BINDPROCESS, (int)getpid(), -+ PROCESSOR_CLASS_ANY); -+ if (status != OK) { -+ ap_log_error(APLOG_MARK, APLOG_DEBUG, errno, -+ ap_server_conf, APLOGNO(00160) "processor unbind failed"); -+ } -+#endif -+ RAISE_SIGSTOP(MAKE_CHILD); -+ AP_MONCONTROL(1); -+ /* Disable the parent's signal handlers and set up proper handling in -+ * the child. -+ */ -+ apr_signal(SIGHUP, just_die); -+ apr_signal(SIGTERM, just_die); -+ /* The child process just closes listeners on AP_SIG_GRACEFUL. -+ * The pod is used for signalling the graceful restart. -+ */ -+ apr_signal(AP_SIG_GRACEFUL, stop_listening); -+ child_main(slot); -+ } -+ -+ itk_note_child_started(slot, pid); -+ -+ return 0; -+} -+ -+ -+/* start up a bunch of children */ -+static void startup_children(int number_to_start) -+{ -+ int i; -+ -+ for (i = 0; number_to_start && i < ap_daemons_limit; ++i) { -+ if (ap_scoreboard_image->servers[i][0].status != SERVER_DEAD) { -+ continue; -+ } -+ if (make_child(ap_server_conf, i) < 0) { -+ break; -+ } -+ --number_to_start; -+ } -+} -+ -+static void perform_idle_server_maintenance(apr_pool_t *p) -+{ -+ int i; -+ int idle_count; -+ worker_score *ws; -+ int free_length; -+ int free_slots[MAX_SPAWN_RATE]; -+ int last_non_dead; -+ int total_non_dead; -+ -+ /* initialize the free_list */ -+ free_length = 0; -+ -+ idle_count = 0; -+ last_non_dead = -1; -+ total_non_dead = 0; -+ -+ for (i = 0; i < ap_daemons_limit; ++i) { -+ int status; -+ -+ if (i >= retained->max_daemons_limit && free_length == retained->idle_spawn_rate) -+ break; -+ ws = &ap_scoreboard_image->servers[i][0]; -+ status = ws->status; -+ if (status == SERVER_DEAD) { -+ /* try to keep children numbers as low as possible */ -+ if (free_length < retained->idle_spawn_rate) { -+ free_slots[free_length] = i; -+ ++free_length; -+ } -+ } -+ else { -+ /* We consider a starting server as idle because we started it -+ * at least a cycle ago, and if it still hasn't finished starting -+ * then we're just going to swamp things worse by forking more. -+ * So we hopefully won't need to fork more if we count it. -+ * This depends on the ordering of SERVER_READY and SERVER_STARTING. -+ */ -+ if (status <= SERVER_READY) { -+ ++ idle_count; -+ } -+ -+ ++total_non_dead; -+ last_non_dead = i; -+ } -+ } -+ retained->max_daemons_limit = last_non_dead + 1; -+ if (idle_count > ap_daemons_max_free) { -+ /* kill off one child... we use the pod because that'll cause it to -+ * shut down gracefully, in case it happened to pick up a request -+ * while we were counting -+ */ -+ ap_mpm_pod_signal(pod); -+ retained->idle_spawn_rate = 1; -+ } -+ else if (idle_count < ap_daemons_min_free) { -+ /* terminate the free list */ -+ if (free_length == 0) { -+ /* only report this condition once */ -+ if (!retained->maxclients_reported) { -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(00161) -+ "server reached MaxRequestWorkers setting, consider" -+ " raising the MaxRequestWorkers setting"); -+ retained->maxclients_reported = 1; -+ } -+ retained->idle_spawn_rate = 1; -+ } -+ else { -+ if (retained->idle_spawn_rate >= 8) { -+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00162) -+ "server seems busy, (you may need " -+ "to increase StartServers, or Min/MaxSpareServers), " -+ "spawning %d children, there are %d idle, and " -+ "%d total children", retained->idle_spawn_rate, -+ idle_count, total_non_dead); -+ } -+ for (i = 0; i < free_length; ++i) { -+ make_child(ap_server_conf, free_slots[i]); -+ } -+ /* the next time around we want to spawn twice as many if this -+ * wasn't good enough, but not if we've just done a graceful -+ */ -+ if (retained->hold_off_on_exponential_spawning) { -+ --retained->hold_off_on_exponential_spawning; -+ } -+ else if (retained->idle_spawn_rate < MAX_SPAWN_RATE) { -+ retained->idle_spawn_rate *= 2; -+ } -+ } -+ } -+ else { -+ retained->idle_spawn_rate = 1; -+ } -+} -+ -+/***************************************************************** -+ * Executive routines. -+ */ -+ -+static int itk_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) -+{ -+ int index; -+ int remaining_children_to_start; -+ apr_status_t rv; -+ -+ ap_log_pid(pconf, ap_pid_fname); -+ -+ /* Initialize cross-process accept lock */ -+ rv = ap_proc_mutex_create(&accept_mutex, NULL, AP_ACCEPT_MUTEX_TYPE, NULL, -+ s, _pconf, 0); -+ if (rv != APR_SUCCESS) { -+ mpm_state = AP_MPMQ_STOPPING; -+ return DONE; -+ } -+ -+ if (!retained->is_graceful) { -+ if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) { -+ mpm_state = AP_MPMQ_STOPPING; -+ return DONE; -+ } -+ /* fix the generation number in the global score; we just got a new, -+ * cleared scoreboard -+ */ -+ ap_scoreboard_image->global->running_generation = retained->my_generation; -+ } -+ -+ restart_pending = shutdown_pending = 0; -+ set_signals(); -+ -+ if (one_process) { -+ AP_MONCONTROL(1); -+ make_child(ap_server_conf, 0); -+ /* NOTREACHED */ -+ } -+ else { -+ if (ap_daemons_max_free < ap_daemons_min_free + 1) /* Don't thrash... */ -+ ap_daemons_max_free = ap_daemons_min_free + 1; -+ -+ /* If we're doing a graceful_restart then we're going to see a lot -+ * of children exiting immediately when we get into the main loop -+ * below (because we just sent them AP_SIG_GRACEFUL). This happens pretty -+ * rapidly... and for each one that exits we'll start a new one until -+ * we reach at least daemons_min_free. But we may be permitted to -+ * start more than that, so we'll just keep track of how many we're -+ * supposed to start up without the 1 second penalty between each fork. -+ */ -+ remaining_children_to_start = ap_daemons_to_start; -+ if (remaining_children_to_start > ap_daemons_limit) { -+ remaining_children_to_start = ap_daemons_limit; -+ } -+ if (!retained->is_graceful) { -+ startup_children(remaining_children_to_start); -+ remaining_children_to_start = 0; -+ } -+ else { -+ /* give the system some time to recover before kicking into -+ * exponential mode -+ */ -+ retained->hold_off_on_exponential_spawning = 10; -+ } -+ -+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00163) -+ "%s configured -- resuming normal operations", -+ ap_get_server_description()); -+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00164) -+ "Server built: %s", ap_get_server_built()); -+ ap_log_command_line(plog, s); -+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00165) -+ "Accept mutex: %s (default: %s)", -+ apr_proc_mutex_name(accept_mutex), -+ apr_proc_mutex_defname()); -+ -+ mpm_state = AP_MPMQ_RUNNING; -+ -+ while (!restart_pending && !shutdown_pending) { -+ int child_slot; -+ apr_exit_why_e exitwhy; -+ int status, processed_status; -+ /* this is a memory leak, but I'll fix it later. */ -+ apr_proc_t pid; -+ -+ ap_wait_or_timeout(&exitwhy, &status, &pid, pconf, ap_server_conf); -+ -+ /* XXX: if it takes longer than 1 second for all our children -+ * to start up and get into IDLE state then we may spawn an -+ * extra child -+ */ -+ if (pid.pid != -1) { -+ processed_status = ap_process_child_status(&pid, exitwhy, status); -+ child_slot = ap_find_child_by_pid(&pid); -+ if (processed_status == APEXIT_CHILDFATAL) { -+ /* fix race condition found in PR 39311 -+ * A child created at the same time as a graceful happens -+ * can find the lock missing and create a fatal error. -+ * It is not fatal for the last generation to be in this state. -+ */ -+ if (child_slot < 0 -+ || ap_get_scoreboard_process(child_slot)->generation -+ == retained->my_generation) { -+ mpm_state = AP_MPMQ_STOPPING; -+ return DONE; -+ } -+ else { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf, APLOGNO(00166) -+ "Ignoring fatal error in child of previous " -+ "generation (pid %ld).", -+ (long)pid.pid); -+ } -+ } -+ -+ /* non-fatal death... note that it's gone in the scoreboard. */ -+ if (child_slot >= 0) { -+ (void) ap_update_child_status_from_indexes(child_slot, 0, SERVER_DEAD, -+ (request_rec *) NULL); -+ itk_note_child_killed(child_slot, 0, 0); -+ if (processed_status == APEXIT_CHILDSICK) { -+ /* child detected a resource shortage (E[NM]FILE, ENOBUFS, etc) -+ * cut the fork rate to the minimum -+ */ -+ retained->idle_spawn_rate = 1; -+ } -+ else if (remaining_children_to_start -+ && child_slot < ap_daemons_limit) { -+ /* we're still doing a 1-for-1 replacement of dead -+ * children with new children -+ */ -+ make_child(ap_server_conf, child_slot); -+ --remaining_children_to_start; -+ } -+#if APR_HAS_OTHER_CHILD -+ } -+ else if (apr_proc_other_child_alert(&pid, APR_OC_REASON_DEATH, status) == APR_SUCCESS) { -+ /* handled */ -+#endif -+ } -+ else if (retained->is_graceful) { -+ /* Great, we've probably just lost a slot in the -+ * scoreboard. Somehow we don't know about this -+ * child. -+ */ -+ ap_log_error(APLOG_MARK, APLOG_WARNING, -+ 0, ap_server_conf, APLOGNO(00167) -+ "long lost child came home! (pid %ld)", (long)pid.pid); -+ } -+ /* Don't perform idle maintenance when a child dies, -+ * only do it when there's a timeout. Remember only a -+ * finite number of children can die, and it's pretty -+ * pathological for a lot to die suddenly. -+ */ -+ continue; -+ } -+ else if (remaining_children_to_start) { -+ /* we hit a 1 second timeout in which none of the previous -+ * generation of children needed to be reaped... so assume -+ * they're all done, and pick up the slack if any is left. -+ */ -+ startup_children(remaining_children_to_start); -+ remaining_children_to_start = 0; -+ /* In any event we really shouldn't do the code below because -+ * few of the servers we just started are in the IDLE state -+ * yet, so we'd mistakenly create an extra server. -+ */ -+ continue; -+ } -+ -+ perform_idle_server_maintenance(pconf); -+ } -+ } /* one_process */ -+ -+ mpm_state = AP_MPMQ_STOPPING; -+ -+ if (shutdown_pending && !retained->is_graceful) { -+ /* Time to shut down: -+ * Kill child processes, tell them to call child_exit, etc... -+ */ -+ if (ap_unixd_killpg(getpgrp(), SIGTERM) < 0) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00168) "killpg SIGTERM"); -+ } -+ ap_reclaim_child_processes(1, /* Start with SIGTERM */ -+ itk_note_child_killed); -+ -+ /* cleanup pid file on normal shutdown */ -+ ap_remove_pid(pconf, ap_pid_fname); -+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00169) -+ "caught SIGTERM, shutting down"); -+ -+ return DONE; -+ } else if (shutdown_pending) { -+ /* Time to perform a graceful shut down: -+ * Reap the inactive children, and ask the active ones -+ * to close their listeners, then wait until they are -+ * all done to exit. -+ */ -+ int active_children; -+ apr_time_t cutoff = 0; -+ -+ /* Stop listening */ -+ ap_close_listeners(); -+ -+ /* kill off the idle ones */ -+ ap_mpm_pod_killpg(pod, retained->max_daemons_limit); -+ -+ /* Send SIGUSR1 to the active children */ -+ active_children = 0; -+ for (index = 0; index < ap_daemons_limit; ++index) { -+ if (ap_scoreboard_image->servers[index][0].status != SERVER_DEAD) { -+ /* Ask each child to close its listeners. */ -+ ap_mpm_safe_kill(MPM_CHILD_PID(index), AP_SIG_GRACEFUL); -+ active_children++; -+ } -+ } -+ -+ /* Allow each child which actually finished to exit */ -+ ap_relieve_child_processes(itk_note_child_killed); -+ -+ /* cleanup pid file */ -+ ap_remove_pid(pconf, ap_pid_fname); -+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00170) -+ "caught " AP_SIG_GRACEFUL_STOP_STRING ", shutting down gracefully"); -+ -+ if (ap_graceful_shutdown_timeout) { -+ cutoff = apr_time_now() + -+ apr_time_from_sec(ap_graceful_shutdown_timeout); -+ } -+ -+ /* Don't really exit until each child has finished */ -+ shutdown_pending = 0; -+ do { -+ /* Pause for a second */ -+ sleep(1); -+ -+ /* Relieve any children which have now exited */ -+ ap_relieve_child_processes(itk_note_child_killed); -+ -+ active_children = 0; -+ for (index = 0; index < ap_daemons_limit; ++index) { -+ if (ap_mpm_safe_kill(MPM_CHILD_PID(index), 0) == APR_SUCCESS) { -+ active_children = 1; -+ /* Having just one child is enough to stay around */ -+ break; -+ } -+ } -+ } while (!shutdown_pending && active_children && -+ (!ap_graceful_shutdown_timeout || apr_time_now() < cutoff)); -+ -+ /* We might be here because we received SIGTERM, either -+ * way, try and make sure that all of our processes are -+ * really dead. -+ */ -+ ap_unixd_killpg(getpgrp(), SIGTERM); -+ -+ return DONE; -+ } -+ -+ /* we've been told to restart */ -+ apr_signal(SIGHUP, SIG_IGN); -+ apr_signal(AP_SIG_GRACEFUL, SIG_IGN); -+ if (one_process) { -+ /* not worth thinking about */ -+ return DONE; -+ } -+ -+ /* advance to the next generation */ -+ /* XXX: we really need to make sure this new generation number isn't in -+ * use by any of the children. -+ */ -+ ++retained->my_generation; -+ ap_scoreboard_image->global->running_generation = retained->my_generation; -+ -+ if (retained->is_graceful) { -+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00171) -+ "Graceful restart requested, doing restart"); -+ -+ /* kill off the idle ones */ -+ ap_mpm_pod_killpg(pod, retained->max_daemons_limit); -+ -+ /* This is mostly for debugging... so that we know what is still -+ * gracefully dealing with existing request. This will break -+ * in a very nasty way if we ever have the scoreboard totally -+ * file-based (no shared memory) -+ */ -+ for (index = 0; index < ap_daemons_limit; ++index) { -+ if (ap_scoreboard_image->servers[index][0].status != SERVER_DEAD) { -+ ap_scoreboard_image->servers[index][0].status = SERVER_GRACEFUL; -+ /* Ask each child to close its listeners. -+ * -+ * NOTE: we use the scoreboard, because if we send SIGUSR1 -+ * to every process in the group, this may include CGI's, -+ * piped loggers, etc. They almost certainly won't handle -+ * it gracefully. -+ */ -+ ap_mpm_safe_kill(ap_scoreboard_image->parent[index].pid, AP_SIG_GRACEFUL); -+ } -+ } -+ } -+ else { -+ /* Kill 'em off */ -+ if (ap_unixd_killpg(getpgrp(), SIGHUP) < 0) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00172) "killpg SIGHUP"); -+ } -+ ap_reclaim_child_processes(0, /* Not when just starting up */ -+ itk_note_child_killed); -+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00173) -+ "SIGHUP received. Attempting to restart"); -+ } -+ -+ return OK; -+} -+ -+/* This really should be a post_config hook, but the error log is already -+ * redirected by that point, so we need to do this in the open_logs phase. -+ */ -+static int itk_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) -+{ -+ int startup = 0; -+ int level_flags = 0; -+ apr_status_t rv; -+ -+ pconf = p; -+ -+ /* the reverse of pre_config, we want this only the first time around */ -+ if (retained->module_loads == 1) { -+ startup = 1; -+ level_flags |= APLOG_STARTUP; -+ } -+ -+ if ((num_listensocks = ap_setup_listeners(ap_server_conf)) < 1) { -+ ap_log_error(APLOG_MARK, APLOG_ALERT | level_flags, 0, -+ (startup ? NULL : s), -+ "no listening sockets available, shutting down"); -+ return DONE; -+ } -+ -+ if ((rv = ap_mpm_pod_open(pconf, &pod))) { -+ ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv, -+ (startup ? NULL : s), -+ "could not open pipe-of-death"); -+ return DONE; -+ } -+ return OK; -+} -+ -+static int itk_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp) -+{ -+ int no_detach, debug, foreground; -+ apr_status_t rv; -+ const char *userdata_key = "mpm_itk_module"; -+ -+ mpm_state = AP_MPMQ_STARTING; -+ -+ debug = ap_exists_config_define("DEBUG"); -+ -+ if (debug) { -+ foreground = one_process = 1; -+ no_detach = 0; -+ } -+ else -+ { -+ no_detach = ap_exists_config_define("NO_DETACH"); -+ one_process = ap_exists_config_define("ONE_PROCESS"); -+ foreground = ap_exists_config_define("FOREGROUND"); -+ } -+ -+ ap_mutex_register(p, AP_ACCEPT_MUTEX_TYPE, NULL, APR_LOCK_DEFAULT, 0); -+ -+ /* sigh, want this only the second time around */ -+ retained = ap_retained_data_get(userdata_key); -+ if (!retained) { -+ retained = ap_retained_data_create(userdata_key, sizeof(*retained)); -+ retained->max_daemons_limit = -1; -+ retained->idle_spawn_rate = 1; -+ } -+ ++retained->module_loads; -+ if (retained->module_loads == 2) { -+ if (!one_process && !foreground) { -+ /* before we detach, setup crash handlers to log to errorlog */ -+ ap_fatal_signal_setup(ap_server_conf, pconf); -+ rv = apr_proc_detach(no_detach ? APR_PROC_DETACH_FOREGROUND -+ : APR_PROC_DETACH_DAEMONIZE); -+ if (rv != APR_SUCCESS) { -+ ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO(00174) -+ "apr_proc_detach failed"); -+ return HTTP_INTERNAL_SERVER_ERROR; -+ } -+ } -+ } -+ -+ parent_pid = ap_my_pid = getpid(); -+ -+ ap_listen_pre_config(); -+ ap_daemons_to_start = DEFAULT_START_DAEMON; -+ ap_daemons_min_free = DEFAULT_MIN_FREE_DAEMON; -+ ap_daemons_max_free = DEFAULT_MAX_FREE_DAEMON; -+ server_limit = DEFAULT_SERVER_LIMIT; -+ ap_daemons_limit = server_limit; -+ ap_extended_status = 0; -+ -+ return OK; -+} -+ -+static int itk_check_config(apr_pool_t *p, apr_pool_t *plog, -+ apr_pool_t *ptemp, server_rec *s) -+{ -+ int startup = 0; -+ -+ /* the reverse of pre_config, we want this only the first time around */ -+ if (retained->module_loads == 1) { -+ startup = 1; -+ } -+ -+ if (server_limit > MAX_SERVER_LIMIT) { -+ if (startup) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00175) -+ "WARNING: ServerLimit of %d exceeds compile-time " -+ "limit of", server_limit); -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, -+ " %d servers, decreasing to %d.", -+ MAX_SERVER_LIMIT, MAX_SERVER_LIMIT); -+ } else { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00176) -+ "ServerLimit of %d exceeds compile-time limit " -+ "of %d, decreasing to match", -+ server_limit, MAX_SERVER_LIMIT); -+ } -+ server_limit = MAX_SERVER_LIMIT; -+ } -+ else if (server_limit < 1) { -+ if (startup) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00177) -+ "WARNING: ServerLimit of %d not allowed, " -+ "increasing to 1.", server_limit); -+ } else { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00178) -+ "ServerLimit of %d not allowed, increasing to 1", -+ server_limit); -+ } -+ server_limit = 1; -+ } -+ -+ /* you cannot change ServerLimit across a restart; ignore -+ * any such attempts -+ */ -+ if (!retained->first_server_limit) { -+ retained->first_server_limit = server_limit; -+ } -+ else if (server_limit != retained->first_server_limit) { -+ /* don't need a startup console version here */ -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00179) -+ "changing ServerLimit to %d from original value of %d " -+ "not allowed during restart", -+ server_limit, retained->first_server_limit); -+ server_limit = retained->first_server_limit; -+ } -+ -+ if (ap_daemons_limit > server_limit) { -+ if (startup) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00180) -+ "WARNING: MaxRequestWorkers of %d exceeds ServerLimit " -+ "value of", ap_daemons_limit); -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, -+ " %d servers, decreasing MaxRequestWorkers to %d.", -+ server_limit, server_limit); -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, -+ " To increase, please see the ServerLimit " -+ "directive."); -+ } else { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00181) -+ "MaxRequestWorkers of %d exceeds ServerLimit value " -+ "of %d, decreasing to match", -+ ap_daemons_limit, server_limit); -+ } -+ ap_daemons_limit = server_limit; -+ } -+ else if (ap_daemons_limit < 1) { -+ if (startup) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00182) -+ "WARNING: MaxRequestWorkers of %d not allowed, " -+ "increasing to 1.", ap_daemons_limit); -+ } else { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00183) -+ "MaxRequestWorkers of %d not allowed, increasing to 1", -+ ap_daemons_limit); -+ } -+ ap_daemons_limit = 1; -+ } -+ -+ /* ap_daemons_to_start > ap_daemons_limit checked in itk_run() */ -+ if (ap_daemons_to_start < 0) { -+ if (startup) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00184) -+ "WARNING: StartServers of %d not allowed, " -+ "increasing to 1.", ap_daemons_to_start); -+ } else { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00185) -+ "StartServers of %d not allowed, increasing to 1", -+ ap_daemons_to_start); -+ } -+ ap_daemons_to_start = 1; -+ } -+ -+ if (ap_daemons_min_free < 1) { -+ if (startup) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00186) -+ "WARNING: MinSpareServers of %d not allowed, " -+ "increasing to 1", ap_daemons_min_free); -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, -+ " to avoid almost certain server failure."); -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, -+ " Please read the documentation."); -+ } else { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00187) -+ "MinSpareServers of %d not allowed, increasing to 1", -+ ap_daemons_min_free); -+ } -+ ap_daemons_min_free = 1; -+ } -+ -+ /* ap_daemons_max_free < ap_daemons_min_free + 1 checked in itk_run() */ -+ -+ return OK; -+} -+ -+static int itk_post_perdir_config(request_rec *r) -+{ -+ uid_t wanted_uid; -+ gid_t wanted_gid; -+ const char *wanted_username; -+ int err = 0; -+ -+ itk_server_conf *sconf = -+ (itk_server_conf *) ap_get_module_config(r->server->module_config, &mpm_itk_module); -+ itk_per_dir_conf *dconf; -+ -+ /* Enforce MaxClientsVhost. */ -+ if (sconf->max_clients_vhost > 0) { -+ int i, num_other_servers = 0; -+ for (i = 0; i < ap_daemons_limit; ++i) { -+ worker_score *ws = &ap_scoreboard_image->servers[i][0]; -+ if (ws->status >= SERVER_BUSY_READ && strncmp(ws->vhost, r->server->server_hostname, 31) == 0) -+ ++num_other_servers; -+ } -+ -+ if (num_other_servers > sconf->max_clients_vhost) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, \ -+ "MaxClientsVhost reached for %s, refusing client.", -+ r->server->server_hostname); -+ return HTTP_SERVICE_UNAVAILABLE; -+ } -+ } -+ -+ dconf = (itk_per_dir_conf *) ap_get_module_config(r->per_dir_config, &mpm_itk_module); -+ -+ strncpy(ap_scoreboard_image->servers[my_child_num][0].vhost, r->server->server_hostname, 31); -+ ap_scoreboard_image->servers[my_child_num][0].vhost[31] = 0; -+ -+ if (dconf->nice_value != UNSET_NICE_VALUE && -+ setpriority(PRIO_PROCESS, 0, dconf->nice_value)) { -+ _DBG("setpriority(): %s", strerror(errno)); -+ err = 1; -+ } -+ -+ wanted_uid = dconf->uid; -+ wanted_gid = dconf->gid; -+ wanted_username = dconf->username; -+ -+ if (wanted_uid == -1 || wanted_gid == -1) { -+ wanted_uid = ap_unixd_config.user_id; -+ wanted_gid = ap_unixd_config.group_id; -+ wanted_username = ap_unixd_config.user_name; -+ } -+ -+ /* AssignUserIDExpr and AssignGroupIDExpr override AssignUserID and defaults. */ -+ if (dconf->uid_expr != NULL) { -+ struct passwd *ent; -+ const char *err; -+ wanted_username = ap_expr_str_exec(r, dconf->uid_expr, &err); -+ if (err) { -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, \ -+ "Error while parsing AssignUserIDExpr expression: %s", -+ err); -+ return HTTP_INTERNAL_SERVER_ERROR; -+ } -+ -+ if (!(ent = getpwnam(wanted_username))) { -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, \ -+ "AssignUserIDExpr returned '%s', which is not a valid user name", -+ wanted_username); -+ return HTTP_INTERNAL_SERVER_ERROR; -+ } -+ -+ wanted_uid = ent->pw_uid; -+ } -+ if (dconf->gid_expr != NULL) { -+ struct group *ent; -+ const char *err; -+ const char *wanted_groupname = ap_expr_str_exec(r, dconf->gid_expr, &err); -+ if (err) { -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, \ -+ "Error while parsing AssignGroupIDExpr expression: %s", -+ err); -+ return HTTP_INTERNAL_SERVER_ERROR; -+ } -+ -+ if (!(ent = getgrnam(wanted_groupname))) { -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, \ -+ "AssignGroupIDExpr returned '%s', which is not a valid group name", -+ wanted_username); -+ return HTTP_INTERNAL_SERVER_ERROR; -+ } -+ -+ wanted_gid = ent->gr_gid; -+ } -+ -+ if (!err && wanted_uid != -1 && wanted_gid != -1 && (getuid() != wanted_uid || getgid() != wanted_gid)) { -+ if (setgid(wanted_gid)) { -+ _DBG("setgid(%d): %s", wanted_gid, strerror(errno)); -+ err = 1; -+ } else if (initgroups(wanted_username, wanted_gid)) { -+ _DBG("initgroups(%s, %d): %s", wanted_username, wanted_gid, strerror(errno)); -+ err = 1; -+ } else if (setuid(wanted_uid)) { -+ _DBG("setuid(%d): %s", wanted_uid, strerror(errno)); -+ err = 1; -+ } -+ } -+ -+ /* -+ * Most likely a case of switching uid/gid within a persistent -+ * connection; the RFCs allow us to just close the connection -+ * at anytime, so we excercise our right. :-) -+ */ -+ if (err) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, \ -+ "Couldn't set uid/gid/priority, closing connection."); -+ ap_lingering_close(r->connection); -+ exit(0); -+ } -+ return OK; -+} -+ -+static void itk_hooks(apr_pool_t *p) -+{ -+ /* Our open_logs hook function must run before the core's, or stderr -+ * will be redirected to a file, and the messages won't print to the -+ * console. -+ */ -+ static const char *const aszSucc[] = {"core.c", NULL}; -+ -+ ap_hook_open_logs(itk_open_logs, NULL, aszSucc, APR_HOOK_REALLY_FIRST); -+ /* we need to set the MPM state before other pre-config hooks use MPM query -+ * to retrieve it, so register as REALLY_FIRST -+ */ -+ ap_hook_pre_config(itk_pre_config, NULL, NULL, APR_HOOK_REALLY_FIRST); -+ ap_hook_check_config(itk_check_config, NULL, NULL, APR_HOOK_MIDDLE); -+ ap_hook_mpm(itk_run, NULL, NULL, APR_HOOK_MIDDLE); -+ ap_hook_mpm_query(itk_query, NULL, NULL, APR_HOOK_MIDDLE); -+ ap_hook_mpm_get_name(itk_get_name, NULL, NULL, APR_HOOK_MIDDLE); -+ -+ /* set the uid as fast as possible, but not before merging per-dir config */ -+ ap_hook_header_parser(itk_post_perdir_config, NULL, NULL, APR_HOOK_REALLY_FIRST); -+} -+ -+static const char *set_daemons_to_start(cmd_parms *cmd, void *dummy, const char *arg) -+{ -+ const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); -+ if (err != NULL) { -+ return err; -+ } -+ -+ ap_daemons_to_start = atoi(arg); -+ return NULL; -+} -+ -+static const char *set_min_free_servers(cmd_parms *cmd, void *dummy, const char *arg) -+{ -+ const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); -+ if (err != NULL) { -+ return err; -+ } -+ -+ ap_daemons_min_free = atoi(arg); -+ return NULL; -+} -+ -+static const char *set_max_free_servers(cmd_parms *cmd, void *dummy, const char *arg) -+{ -+ const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); -+ if (err != NULL) { -+ return err; -+ } -+ -+ ap_daemons_max_free = atoi(arg); -+ return NULL; -+} -+ -+static const char *set_max_clients (cmd_parms *cmd, void *dummy, const char *arg) -+{ -+ const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); -+ if (err != NULL) { -+ return err; -+ } -+ if (!strcasecmp(cmd->cmd->name, "MaxClients")) { -+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, APLOGNO(00188) -+ "MaxClients is deprecated, use MaxRequestWorkers " -+ "instead."); -+ } -+ ap_daemons_limit = atoi(arg); -+ return NULL; -+} -+ -+static const char *set_server_limit (cmd_parms *cmd, void *dummy, const char *arg) -+{ -+ const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); -+ if (err != NULL) { -+ return err; -+ } -+ -+ server_limit = atoi(arg); -+ return NULL; -+} -+ -+static const char *assign_user_id (cmd_parms *cmd, void *ptr, const char *user_name, const char *group_name) -+{ -+ itk_per_dir_conf *dconf = (itk_per_dir_conf *) ptr; -+ -+ const char *err = ap_check_cmd_context(cmd, NOT_IN_HTACCESS); -+ if (err) { -+ return err; -+ } -+ -+ dconf->username = apr_pstrdup(cmd->pool, user_name); -+ dconf->uid = ap_uname2id(user_name); -+ dconf->gid = ap_gname2id(group_name); -+ return NULL; -+} -+ -+static const char *assign_user_id_expr (cmd_parms *cmd, void *ptr, const char *user_name_expr) -+{ -+ itk_per_dir_conf *dconf = (itk_per_dir_conf *) ptr; -+ -+ const char *err; -+ -+ err = ap_check_cmd_context(cmd, NOT_IN_HTACCESS); -+ if (err) { -+ return err; -+ } -+ -+ dconf->uid_expr = ap_expr_parse_cmd_mi(cmd, -+ user_name_expr, -+ AP_EXPR_FLAG_STRING_RESULT, -+ &err, -+ NULL, -+ AP_CORE_MODULE_INDEX); -+ if (err) { -+ return err; -+ } -+ -+ return NULL; -+} -+ -+static const char *assign_group_id_expr (cmd_parms *cmd, void *ptr, const char *group_name_expr) -+{ -+ itk_per_dir_conf *dconf = (itk_per_dir_conf *) ptr; -+ -+ const char *err; -+ -+ err = ap_check_cmd_context(cmd, NOT_IN_HTACCESS); -+ if (err) { -+ return err; -+ } -+ -+ dconf->gid_expr = ap_expr_parse_cmd_mi(cmd, -+ group_name_expr, -+ AP_EXPR_FLAG_STRING_RESULT, -+ &err, -+ NULL, -+ AP_CORE_MODULE_INDEX); -+ if (err) { -+ return err; -+ } -+ return NULL; -+} -+ -+static const char *set_max_clients_vhost (cmd_parms *cmd, void *dummy, const char *arg) -+{ -+ itk_server_conf *sconf = -+ (itk_server_conf *) ap_get_module_config(cmd->server->module_config, &mpm_itk_module); -+ sconf->max_clients_vhost = atoi(arg); -+ return NULL; -+} -+ -+static const char *set_nice_value (cmd_parms *cmd, void *ptr, const char *arg) -+{ -+ itk_per_dir_conf *dconf = (itk_per_dir_conf *) ptr; -+ int nice_value = atoi(arg); -+ -+ if (nice_value < -20) { -+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, -+ "WARNING: NiceValue of %d is below -20, increasing NiceValue to -20.", -+ nice_value); -+ nice_value = -20; -+ } -+ else if (nice_value > 19) { -+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, -+ "WARNING: NiceValue of %d is above 19, lowering NiceValue to 19.", -+ nice_value); -+ nice_value = 19; -+ } -+ dconf->nice_value = nice_value; -+ return NULL; -+} -+ -+static const command_rec itk_cmds[] = { -+LISTEN_COMMANDS, -+AP_INIT_TAKE1("StartServers", set_daemons_to_start, NULL, RSRC_CONF, -+ "Number of child processes launched at server startup"), -+AP_INIT_TAKE1("MinSpareServers", set_min_free_servers, NULL, RSRC_CONF, -+ "Minimum number of idle children, to handle request spikes"), -+AP_INIT_TAKE1("MaxSpareServers", set_max_free_servers, NULL, RSRC_CONF, -+ "Maximum number of idle children"), -+AP_INIT_TAKE1("MaxClients", set_max_clients, NULL, RSRC_CONF, -+ "Deprecated name of MaxRequestWorkers"), -+AP_INIT_TAKE1("MaxRequestWorkers", set_max_clients, NULL, RSRC_CONF, -+ "Maximum number of children alive at the same time"), -+AP_INIT_TAKE1("ServerLimit", set_server_limit, NULL, RSRC_CONF, -+ "Maximum value of MaxRequestWorkers for this run of Apache"), -+AP_INIT_TAKE2("AssignUserID", assign_user_id, NULL, RSRC_CONF|ACCESS_CONF, -+ "Tie a virtual host to a specific child process."), -+AP_INIT_RAW_ARGS("AssignUserIDExpr", assign_user_id_expr, NULL, RSRC_CONF|ACCESS_CONF, -+ "Choose user ID given an expression. Will override AssignUserID."), -+AP_INIT_RAW_ARGS("AssignGroupIDExpr", assign_group_id_expr, NULL, RSRC_CONF|ACCESS_CONF, -+ "Choose group ID given an expression. Will override AssignUserID."), -+AP_INIT_TAKE1("MaxClientsVHost", set_max_clients_vhost, NULL, RSRC_CONF, -+ "Maximum number of children alive at the same time for this virtual host."), -+AP_INIT_TAKE1("NiceValue", set_nice_value, NULL, RSRC_CONF|ACCESS_CONF, -+ "Set nice value for the given vhost, from -20 (highest priority) to 19 (lowest priority)."), -+AP_GRACEFUL_SHUTDOWN_TIMEOUT_COMMAND, -+{ NULL } -+}; -+ -+/* == allocate a private per-dir config structure == */ -+static void *itk_create_dir_config(apr_pool_t *p, char *dummy) -+{ -+ itk_per_dir_conf *c = (itk_per_dir_conf *) -+ apr_pcalloc(p, sizeof(itk_per_dir_conf)); -+ c->uid = c->gid = -1; -+ c->uid_expr = c->gid_expr = NULL; -+ c->nice_value = UNSET_NICE_VALUE; -+ return c; -+} -+ -+/* == merge the parent per-dir config structure into ours == */ -+static void *itk_merge_dir_config(apr_pool_t *p, void *parent_ptr, void *child_ptr) -+{ -+ itk_per_dir_conf *c = (itk_per_dir_conf *) -+ itk_create_dir_config(p, NULL); -+ itk_per_dir_conf *parent = (itk_per_dir_conf *) parent_ptr; -+ itk_per_dir_conf *child = (itk_per_dir_conf *) child_ptr; -+ -+ if (child->username != NULL) { -+ c->username = child->username; -+ c->uid = child->uid; -+ c->gid = child->gid; -+ } else { -+ c->username = parent->username; -+ c->uid = parent->uid; -+ c->gid = parent->gid; -+ } -+ if (child->uid_expr != NULL) { -+ c->uid_expr = child->uid_expr; -+ } else { -+ c->uid_expr = parent->uid_expr; -+ } -+ if (child->gid_expr != NULL) { -+ c->gid_expr = child->gid_expr; -+ } else { -+ c->gid_expr = parent->gid_expr; -+ } -+ if (child->nice_value != UNSET_NICE_VALUE) { -+ c->nice_value = child->nice_value; -+ } else { -+ c->nice_value = parent->nice_value; -+ } -+ return c; -+} -+ -+/* == allocate a private server config structure == */ -+static void *itk_create_server_config(apr_pool_t *p, server_rec *s) -+{ -+ itk_server_conf *c = (itk_server_conf *) -+ apr_pcalloc(p, sizeof(itk_server_conf)); -+ c->max_clients_vhost = -1; -+ return c; -+} -+ -+AP_DECLARE_MODULE(mpm_itk) = { -+ MPM20_MODULE_STUFF, -+ NULL, /* hook to run before apache parses args */ -+ itk_create_dir_config, /* create per-directory config structure */ -+ itk_merge_dir_config, /* merge per-directory config structures */ -+ itk_create_server_config, /* create per-server config structure */ -+ NULL, /* merge per-server config structures */ -+ itk_cmds, /* command apr_table_t */ -+ itk_hooks, /* register hooks */ -+}; -Index: httpd-2.4.2/server/mpm/itk/mpm_default.h -=================================================================== ---- /dev/null -+++ httpd-2.4.2/server/mpm/itk/mpm_default.h -@@ -0,0 +1,57 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ * Portions copyright 2005-2012 Steinar H. Gunderson . -+ * Licensed under the same terms as the rest of Apache. -+ * -+ * Portions copyright 2008 Knut Auvor Grythe . -+ * Licensed under the same terms as the rest of Apache. -+ */ -+ -+/** -+ * @file itk/mpm_default.h -+ * @brief ITK MPM defaults -+ * -+ * @defgroup APACHE_MPM_ITK Apache ITK -+ * @ingroup APACHE_INTERNAL -+ * @{ -+ */ -+ -+#ifndef APACHE_MPM_DEFAULT_H -+#define APACHE_MPM_DEFAULT_H -+ -+/* Number of servers to spawn off by default --- also, if fewer than -+ * this free when the caretaker checks, it will spawn more. -+ */ -+#ifndef DEFAULT_START_DAEMON -+#define DEFAULT_START_DAEMON 5 -+#endif -+ -+/* Maximum number of *free* server processes --- more than this, and -+ * they will die off. -+ */ -+ -+#ifndef DEFAULT_MAX_FREE_DAEMON -+#define DEFAULT_MAX_FREE_DAEMON 10 -+#endif -+ -+/* Minimum --- fewer than this, and more will be created */ -+ -+#ifndef DEFAULT_MIN_FREE_DAEMON -+#define DEFAULT_MIN_FREE_DAEMON 5 -+#endif -+ -+#endif /* AP_MPM_DEFAULT_H */ -+/** @} */ -Index: httpd-2.4.2/server/mpm/config2.m4 -=================================================================== ---- httpd-2.4.2.orig/server/mpm/config2.m4 -+++ httpd-2.4.2/server/mpm/config2.m4 -@@ -1,7 +1,7 @@ - AC_MSG_CHECKING(which MPM to use by default) - AC_ARG_WITH(mpm, - APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use by default. -- MPM={event|worker|prefork|winnt} -+ MPM={event|worker|prefork|winnt|itk} - This will be statically linked as the only available MPM unless - --enable-mpms-shared is also specified. - ),[ -@@ -66,6 +66,9 @@ for i in $ap_enabled_mpms; do - else - AC_MSG_ERROR([MPM $i is not supported on this platform.]) - fi -+ if test "$i" = "itk" ; then -+ AC_CHECK_LIB(cap, cap_init) -+ fi - done - - if test $mpm_build = "shared"; then -Index: httpd-2.4.2/modules/arch/unix/config5.m4 -=================================================================== ---- httpd-2.4.2.orig/modules/arch/unix/config5.m4 -+++ httpd-2.4.2/modules/arch/unix/config5.m4 -@@ -3,6 +3,7 @@ APACHE_MODPATH_INIT(arch/unix) - - if ap_mpm_is_enabled "worker" \ - || ap_mpm_is_enabled "event" \ -+ || ap_mpm_is_enabled "itk" \ - || ap_mpm_is_enabled "prefork"; then - unixd_mods_enable=yes - else -Index: httpd-2.4.2/server/request.c -=================================================================== ---- httpd-2.4.2.orig/server/request.c -+++ httpd-2.4.2/server/request.c -@@ -69,6 +69,7 @@ APR_HOOK_STRUCT( - APR_HOOK_LINK(auth_checker) - APR_HOOK_LINK(insert_filter) - APR_HOOK_LINK(create_request) -+ APR_HOOK_LINK(post_perdir_config) - ) - - AP_IMPLEMENT_HOOK_RUN_FIRST(int,translate_name, -@@ -91,10 +92,26 @@ AP_IMPLEMENT_HOOK_VOID(insert_filter, (r - AP_IMPLEMENT_HOOK_RUN_ALL(int, create_request, - (request_rec *r), (r), OK, DECLINED) - -+/** -+ * This hook allows modules to affect the request immediately after the -+ * per-directory configuration for the request has been generated. This allows -+ * modules to make decisions based upon the current directory configuration -+ * -+ * This hook is private to mpm-itk, so it is not exposed in http_request.h. -+ * -+ * @param r The current request -+ * @return OK or DECLINED -+ */ -+AP_DECLARE_HOOK(int,post_perdir_config,(request_rec *r)) -+ -+AP_IMPLEMENT_HOOK_RUN_ALL(int,post_perdir_config, -+ (request_rec *r), (r), OK, DECLINED) -+ - static int auth_internal_per_conf = 0; - static int auth_internal_per_conf_hooks = 0; - static int auth_internal_per_conf_providers = 0; - -+extern AP_DECLARE_DATA int ap_running_under_mpm_itk; - - static int decl_die(int status, const char *phase, request_rec *r) - { -@@ -191,6 +208,13 @@ AP_DECLARE(int) ap_process_request_inter - r->log = d->log; - } - -+ /* First chance to handle the request after per-directory configuration is -+ * generated -+ */ -+ if ((access_status = ap_run_post_perdir_config(r))) { -+ return access_status; -+ } -+ - /* Only on the main request! */ - if (r->main == NULL) { - if ((access_status = ap_run_header_parser(r))) { -@@ -1093,6 +1117,16 @@ AP_DECLARE(int) ap_directory_walk(reques - break; - } - else if (APR_STATUS_IS_EACCES(rv)) { -+ /* See the corresponding section in server/config.c for the rationale -+ * behind this logic. -+ */ -+ if (ap_running_under_mpm_itk && r->main == NULL && getuid() != 0) { -+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r, -+ "Access to %s denied, closing connection.", -+ r->filename); -+ ap_lingering_close(r->connection); -+ exit(0); -+ } - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(00035) - "access to %s denied (filesystem path '%s') " - "because search permissions are missing on a " -Index: httpd-2.4.2/server/config.c -=================================================================== ---- httpd-2.4.2.orig/server/config.c -+++ httpd-2.4.2/server/config.c -@@ -69,6 +69,8 @@ AP_DECLARE_DATA apr_array_header_t *ap_s - - AP_DECLARE_DATA ap_directive_t *ap_conftree = NULL; - -+AP_DECLARE_DATA int ap_running_under_mpm_itk = 0; -+ - APR_HOOK_STRUCT( - APR_HOOK_LINK(header_parser) - APR_HOOK_LINK(pre_config) -@@ -2129,6 +2131,32 @@ AP_CORE_DECLARE(int) ap_parse_htaccess(a - else { - if (!APR_STATUS_IS_ENOENT(status) - && !APR_STATUS_IS_ENOTDIR(status)) { -+ /* -+ * If we are in a persistent connection, we might end up in a state -+ * where we can no longer read .htaccess files because we have already -+ * setuid(). This can either be because the previous request was for -+ * another vhost (basically the same problem as when setuid() fails in -+ * itk.c), or it can be because a .htaccess file is readable only by -+ * root. -+ * -+ * In any case, we don't want to give out a 403, since the request has -+ * a very real chance of succeeding on a fresh connection (where -+ * presumably uid=0). Thus, we give up serving the request on this -+ * TCP connection, and do a hard close of the socket. As long as we're -+ * in a persistent connection (and there _should_ not be a way this -+ * would happen on the first request in a connection, save for subrequests, -+ * which we special-case), this is allowed, as it is what happens on -+ * a timeout. The browser will simply open a new connection and try -+ * again (there's of course a performance hit, though, both due to -+ * the new connection setup and the fork() of a new server child). -+ */ -+ if (ap_running_under_mpm_itk && r->main == NULL && getuid() != 0) { -+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, status, r, -+ "Couldn't read %s, closing connection.", -+ filename); -+ ap_lingering_close(r->connection); -+ exit(0); -+ } - ap_log_rerror(APLOG_MARK, APLOG_CRIT, status, r, APLOGNO(00529) - "%s pcfg_openfile: unable to check htaccess file, " - "ensure it is readable and that '%s' " diff --git a/apache2.changes b/apache2.changes index 61613b0..793b679 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Jul 22 16:44:22 UTC 2013 - crrodriguez@opensuse.org + +- Update to version 2.4.6 +* SECURITY: CVE-2013-1896 (cve.mitre.org) +* SECURITY: CVE-2013-2249 (cve.mitre.org) +* Major updates to mod_lua +* Support for proxying websocket requests +* Higher performant shm-based cache implementation +* Addition of mod_macro for easier configuration management +* As well as several exciting fixes, especially those related to RFC edge + cases in mod_cache and mod_proxy. + +- IMPORTANT : With the current packaging scheme, we can no longer +Include the ITK MPM, therefore it has been disabled. This is because +this MPM can now only be provided as a loadable module but we do +not currently build MPMs as shared modules but as independant +binaries and all helpers/startup scripts depend on that behaviour. +It will be fixed in the upcoming weeks/months. + ------------------------------------------------------------------- Tue Jun 18 07:41:36 UTC 2013 - crrodriguez@opensuse.org diff --git a/apache2.spec b/apache2.spec index 14ea4d3..8f0e4c7 100644 --- a/apache2.spec +++ b/apache2.spec @@ -54,7 +54,7 @@ BuildRequires: expat-devel %{!?prefork:%define prefork 1} %{!?worker:%define worker 1} %{!?event:%define event 1} -%{!?itk:%define itk 1} +%{!?itk:%define itk 0} %define mpms_to_build %(test %prefork = 1 && printf prefork) %(test %worker = 1 && printf worker) %(test %event = 1 && printf event) %(test %itk = 1 && printf itk) # dir names %define datadir /srv/www @@ -81,8 +81,8 @@ BuildRequires: expat-devel # "Server:" header %define VENDOR SUSE %define platform_string Linux/%VENDOR -%define realver 2.4.4 -Version: 2.4.4 +%define realver 2.4.6 +Version: 2.4.6 Release: 0 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: httpd-%{realver}.tar.bz2 @@ -146,8 +146,6 @@ Patch67: httpd-2.2.0-apxs-a2enmod.dif Patch68: httpd-2.x.x-logresolve.patch Patch69: httpd-2.2.x-bnc690734.patch Patch70: apache2-implicit-pointer-decl.patch -Patch100: apache2.4-mpm-itk-2.4.2-01.patch -Patch101: httpd-2.2.19-linux3.patch # PATCH-FEATURE-UPSTREAM apache2-mod_ssl_npn.patch dimstar@opensuse.org -- Add npn support to mod_ssl (needed for spdy) #Patch108: apache2-mod_ssl_npn.patch #Provides: apache2(mod_ssl+npn) @@ -365,15 +363,13 @@ to administrators of web servers in general. # %setup -q -n httpd-%{realver} %patch2 -p1 -%patch23 +%patch23 -p1 #%patch65 -p1 -%patch66 +%patch66 -p1 %patch67 -p1 %patch68 -p1 #%patch69 %patch70 -p1 -%patch100 -p1 -%patch101 #%patch108 -p1 %patch109 -p1 # diff --git a/httpd-2.0.54-envvars.dif b/httpd-2.0.54-envvars.dif index 7e0ea8e..85814a1 100644 --- a/httpd-2.0.54-envvars.dif +++ b/httpd-2.0.54-envvars.dif @@ -1,5 +1,5 @@ ---- support/envvars-std.in.orig -+++ support/envvars-std.in +--- httpd-2.4.6.orig/support/envvars-std.in ++++ httpd-2.4.6/support/envvars-std.in @@ -18,11 +18,9 @@ # # This file is generated from envvars-std.in diff --git a/httpd-2.1.3alpha-layout.dif b/httpd-2.1.3alpha-layout.dif index 279c746..097bab0 100644 --- a/httpd-2.1.3alpha-layout.dif +++ b/httpd-2.1.3alpha-layout.dif @@ -1,6 +1,6 @@ ---- httpd-2.1.3-alpha.orig/config.layout -+++ httpd-2.1.3-alpha/config.layout -@@ -202,6 +202,54 @@ +--- httpd-2.4.6.orig/config.layout ++++ httpd-2.4.6/config.layout +@@ -178,6 +178,54 @@ proxycachedir: /var/cache/httpd diff --git a/httpd-2.1.9-apachectl.dif b/httpd-2.1.9-apachectl.dif index abe1651..79bbf1b 100644 --- a/httpd-2.1.9-apachectl.dif +++ b/httpd-2.1.9-apachectl.dif @@ -1,5 +1,5 @@ ---- support/apachectl.in.orig -+++ support/apachectl.in +--- httpd-2.4.6.orig/support/apachectl.in ++++ httpd-2.4.6/support/apachectl.in @@ -42,17 +42,32 @@ ARGV="$@" # -------------------- -------------------- # diff --git a/httpd-2.2.0-apxs-a2enmod.dif b/httpd-2.2.0-apxs-a2enmod.dif index 0a15f21..4ef22e7 100644 --- a/httpd-2.2.0-apxs-a2enmod.dif +++ b/httpd-2.2.0-apxs-a2enmod.dif @@ -1,8 +1,6 @@ -Index: httpd-2.2.16/support/apxs.in -=================================================================== ---- httpd-2.2.16.orig/support/apxs.in -+++ httpd-2.2.16/support/apxs.in -@@ -526,108 +526,14 @@ if ($opt_i or $opt_e) { +--- httpd-2.4.6.orig/support/apxs.in ++++ httpd-2.4.6/support/apxs.in +@@ -550,108 +550,14 @@ if ($opt_i or $opt_e) { # activate module via LoadModule/AddModule directive if ($opt_a or $opt_A) { diff --git a/httpd-2.2.19-linux3.patch b/httpd-2.2.19-linux3.patch deleted file mode 100644 index 57ef1c5..0000000 --- a/httpd-2.2.19-linux3.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.in.orig -+++ configure.in -@@ -274,13 +274,7 @@ case $host in - APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) - ;; - *-linux-*) -- case `uname -r` in -- 2.[[2-9]]* ) -- APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) -- ;; -- * ) -- ;; -- esac -+ APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) - ;; - *486-*-bsdi* | *-netbsd* | *-freebsd* | *-apple-darwin* | *-dec-osf* | *-qnx) - APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) diff --git a/httpd-2.4.4.tar.bz2 b/httpd-2.4.4.tar.bz2 deleted file mode 100644 index 4d4f082..0000000 --- a/httpd-2.4.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c -size 4780289 diff --git a/httpd-2.4.6.tar.bz2 b/httpd-2.4.6.tar.bz2 new file mode 100644 index 0000000..d5e5a19 --- /dev/null +++ b/httpd-2.4.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea +size 4949897 diff --git a/httpd-2.x.x-logresolve.patch b/httpd-2.x.x-logresolve.patch index 7db623f..67d4a70 100644 --- a/httpd-2.x.x-logresolve.patch +++ b/httpd-2.x.x-logresolve.patch @@ -1,7 +1,6 @@ -diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl.in ---- ../httpd-2.2.4.orig/support/logresolve.pl.in 2006-07-12 05:38:44.000000000 +0200 -+++ ./support/logresolve.pl.in 2007-10-23 13:59:27.000000000 +0200 -@@ -57,6 +57,7 @@ +--- httpd-2.4.6.orig/support/logresolve.pl.in ++++ httpd-2.4.6/support/logresolve.pl.in +@@ -57,6 +57,7 @@ $|=1; use FileHandle; use Socket; @@ -9,7 +8,7 @@ diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl. use strict; no strict 'refs'; -@@ -71,11 +72,13 @@ +@@ -71,11 +72,13 @@ my $filename; my %hash = (); my $parent = $$; @@ -24,7 +23,7 @@ diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl. if (-e $filename) { unlink($filename) || warn "$filename .. $!\n";} &child($child); exit(0); -@@ -91,9 +94,9 @@ +@@ -91,9 +94,9 @@ sub cleanup { # die kiddies, die kill(15, @children); for (my $child = 1; $child <=$CHILDREN; $child++) { @@ -37,7 +36,7 @@ diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl. } } } -@@ -113,7 +116,7 @@ +@@ -113,7 +116,7 @@ sub parent { if (!socket($CHILDSOCK{$child}, AF_UNIX, SOCK_STREAM, $PROTOCOL)) { warn "parent socket to child failed $!"; } @@ -46,7 +45,7 @@ diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl. my $response; do { $response = connect($CHILDSOCK{$child}, sockaddr_un($filename)); -@@ -176,7 +179,7 @@ +@@ -176,7 +179,7 @@ sub child { # create a socket to communicate with parent socket(INBOUND, AF_UNIX, SOCK_STREAM, $PROTOCOL) || die "Error with Socket: !$\n";