Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1BFB6116D9 for ; Mon, 9 Jun 2014 00:59:28 +0000 (UTC) Received: (qmail 65904 invoked by uid 500); 9 Jun 2014 00:59:28 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 65841 invoked by uid 500); 9 Jun 2014 00:59:27 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 65834 invoked by uid 99); 9 Jun 2014 00:59:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jun 2014 00:59:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jun 2014 00:59:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8CF46238883D; Mon, 9 Jun 2014 00:59:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1601290 - in /httpd/httpd/trunk: CHANGES docs/log-message-tags/next-number modules/proxy/proxy_util.c server/mpm/eventopt/eventopt.c Date: Mon, 09 Jun 2014 00:59:04 -0000 To: cvs@httpd.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140609005905.8CF46238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ylavic Date: Mon Jun 9 00:59:04 2014 New Revision: 1601290 URL: http://svn.apache.org/r1601290 Log: Revert r1601285 and r1601283. Shouldn't have commited the latter without disussing it on dev@. Since the former creates upper APLOGNOs, revert and then recommit with the reverted next tag number. Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/docs/log-message-tags/next-number httpd/httpd/trunk/modules/proxy/proxy_util.c httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1601290&r1=1601289&r2=1601290&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Mon Jun 9 00:59:04 2014 @@ -1,9 +1,6 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 - *) mod_proxy: Shutdown (eg. close notify) the backend connection before - closing. [Yann Ylavic] - *) mpm_event[opt]: Send the SSL close notify alert when the KeepAliveTimeout expires. PR54998. [Yann Ylavic] Modified: httpd/httpd/trunk/docs/log-message-tags/next-number URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1601290&r1=1601289&r2=1601290&view=diff ============================================================================== --- httpd/httpd/trunk/docs/log-message-tags/next-number (original) +++ httpd/httpd/trunk/docs/log-message-tags/next-number Mon Jun 9 00:59:04 2014 @@ -1 +1 @@ -2707 +2642 Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1601290&r1=1601289&r2=1601290&view=diff ============================================================================== --- httpd/httpd/trunk/modules/proxy/proxy_util.c (original) +++ httpd/httpd/trunk/modules/proxy/proxy_util.c Mon Jun 9 00:59:04 2014 @@ -2815,33 +2815,6 @@ PROXY_DECLARE(int) ap_proxy_connect_back return connected ? OK : DECLINED; } -static apr_status_t connection_shutdown(void *theconn) -{ - proxy_conn_rec *conn = (proxy_conn_rec *)theconn; - conn_rec *c = conn->connection; - if (c) { - if (!c->aborted) { - apr_interval_time_t saved_timeout = 0; - apr_socket_timeout_get(conn->sock, &saved_timeout); - if (saved_timeout) { - apr_socket_timeout_set(conn->sock, 0); - } - - (void)ap_shutdown_conn(c, 0); - c->aborted = 1; - - if (saved_timeout) { - apr_socket_timeout_set(conn->sock, saved_timeout); - } - } - - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(02706) - "proxy: connection shutdown"); - } - return APR_SUCCESS; -} - - PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function, proxy_conn_rec *conn, conn_rec *c, @@ -2914,12 +2887,6 @@ PROXY_DECLARE(int) ap_proxy_connection_c } apr_socket_timeout_set(conn->sock, current_timeout); - /* Shutdown the connection before closing it (eg. SSL connections - * need to be close-notify-ed). - */ - apr_pool_cleanup_register(conn->scpool, conn, connection_shutdown, - apr_pool_cleanup_null); - return OK; } Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1601290&r1=1601289&r2=1601290&view=diff ============================================================================== --- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original) +++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Mon Jun 9 00:59:04 2014 @@ -406,7 +406,7 @@ static void disable_listensocks(int proc static void enable_listensocks(int process_slot) { int i; - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02642) + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00457) "Accepting new connections again: " "%u active conns (%u lingering/%u clogged/%u suspended), " "%u idle workers", @@ -578,7 +578,7 @@ static void event_note_child_started(int static void event_note_child_lost_slot(int slot, pid_t newpid) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02643) + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00458) "pid %" APR_PID_T_FMT " taking over scoreboard slot from " "%" APR_PID_T_FMT "%s", newpid, @@ -722,22 +722,22 @@ static void set_signals(void) sa.sa_handler = sig_term; if (sigaction(SIGTERM, &sa, NULL) < 0) - ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(02644) + ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00459) "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(02645) + ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00460) "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(02646) + ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00461) "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(02647) + ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00462) "sigaction(SIGXCPU)"); #endif #ifdef SIGXFSZ @@ -746,13 +746,13 @@ static void set_signals(void) * 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(02648) + ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00463) "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(02649) + ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00464) "sigaction(SIGPIPE)"); #endif @@ -762,10 +762,10 @@ static void set_signals(void) 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(02650) + ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00465) "sigaction(SIGHUP)"); if (sigaction(AP_SIG_GRACEFUL, &sa, NULL) < 0) - ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(02651) + ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO(00466) "sigaction(" AP_SIG_GRACEFUL_STRING ")"); #else if (!one_process) { @@ -954,7 +954,7 @@ static int stop_lingering_close(event_co "socket reached timeout in lingering-close state"); rv = apr_socket_close(csd); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf, APLOGNO(02652) "error closing socket"); + ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf, APLOGNO(00468) "error closing socket"); AP_DEBUG_ASSERT(0); } apr_pool_clear(cs->p); @@ -1008,7 +1008,7 @@ static void process_socket(apr_thread_t rc = ap_run_pre_connection(c, sock); if (rc != OK && rc != DONE) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(02653) + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(00469) "process_socket: connection aborted"); c->aborted = 1; } @@ -1075,7 +1075,7 @@ read_request: } rv = output_filter->frec->filter_func.out_func(output_filter, NULL); if (rv != APR_SUCCESS) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, rv, c, APLOGNO(02654) + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, rv, c, APLOGNO(00470) "network write failure in core output filter"); cs->pub.state = CONN_STATE_LINGER; } @@ -1313,7 +1313,7 @@ static apr_status_t push2worker(const ap apr_bucket_alloc_destroy(cs->bucket_alloc); apr_socket_close(cs->pfd.desc.s); ap_log_error(APLOG_MARK, APLOG_CRIT, rc, - ap_server_conf, APLOGNO(02655) "push2worker: ap_queue_push failed"); + ap_server_conf, APLOGNO(00471) "push2worker: ap_queue_push failed"); apr_pool_clear(cs->p); ap_push_pool(worker_queue_info, cs->p); } @@ -1353,7 +1353,7 @@ static void get_worker(int *have_idle_wo *all_busy = 1; } else if (!APR_STATUS_IS_EOF(rc)) { - ap_log_error(APLOG_MARK, APLOG_ERR, rc, ap_server_conf, APLOGNO(02656) + ap_log_error(APLOG_MARK, APLOG_ERR, rc, ap_server_conf, APLOGNO(00472) "ap_queue_info_wait_for_idler failed. " "Attempting to shutdown process gracefully"); signal_threads(ST_GRACEFUL); @@ -1474,7 +1474,7 @@ static void process_timeout_queue(struct last = cs; rv = apr_pollset_remove(event_pollset, &cs->pfd); if (rv != APR_SUCCESS && !APR_STATUS_IS_NOTFOUND(rv)) { - ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, cs->c, APLOGNO(02657) + ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, cs->c, APLOGNO(00473) "apr_pollset_remove failed"); } cs = APR_RING_NEXT(cs, timeout_list); @@ -2000,7 +2000,7 @@ static void create_listener_thread(threa rv = apr_thread_create(&ts->listener, thread_attr, listener_thread, my_info, pchild); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, APLOGNO(02658) + ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, APLOGNO(00474) "apr_thread_create: unable to create listener thread"); /* let the parent decide how bad this really is */ clean_child_exit(APEXIT_CHILDSICK); @@ -2193,13 +2193,13 @@ static void join_workers(apr_thread_t * ++iter; } if (iter >= 10) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02659) + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00475) "the listener thread didn't stop accepting"); } else { rv = apr_thread_join(&thread_rv, listener); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf, APLOGNO(02660) + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf, APLOGNO(00476) "apr_thread_join: unable to join listener thread"); } } @@ -2209,7 +2209,7 @@ static void join_workers(apr_thread_t * if (threads[i]) { /* if we ever created this thread */ rv = apr_thread_join(&thread_rv, threads[i]); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf, APLOGNO(02661) + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf, APLOGNO(00477) "apr_thread_join: unable to join worker " "thread %d", i); } @@ -2227,7 +2227,7 @@ static void join_start_thread(apr_thread */ rv = apr_thread_join(&thread_rv, start_thread_id); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf, APLOGNO(02662) + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf, APLOGNO(00478) "apr_thread_join: unable to join the start " "thread"); } } @@ -2285,7 +2285,7 @@ static void child_main(int child_num_arg */ rv = apr_setup_signal_thread(); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, APLOGNO(02663) + ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, APLOGNO(00479) "Couldn't initialize signal thread"); clean_child_exit(APEXIT_CHILDFATAL); } @@ -2313,7 +2313,7 @@ static void child_main(int child_num_arg if (ap_thread_stacksize != 0) { rv = apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize); if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) { - ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, APLOGNO(02664) + ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, APLOGNO(02436) "WARNING: ThreadStackSize of %" APR_SIZE_T_FMT " is " "inappropriate, using default", ap_thread_stacksize); @@ -2328,7 +2328,7 @@ static void child_main(int child_num_arg rv = apr_thread_create(&start_thread_id, thread_attr, start_threads, ts, pchild); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, APLOGNO(02665) + ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, APLOGNO(00480) "apr_thread_create: unable to create worker thread"); /* let the parent decide how bad this really is */ clean_child_exit(APEXIT_CHILDSICK); @@ -2430,7 +2430,7 @@ static int make_child(server_rec * s, in } if ((pid = fork()) == -1) { - ap_log_error(APLOG_MARK, APLOG_ERR, errno, s, APLOGNO(02666) + ap_log_error(APLOG_MARK, APLOG_ERR, errno, s, APLOGNO(00481) "fork: Unable to fork new process"); /* fork didn't succeed. There's no need to touch the scoreboard; @@ -2457,7 +2457,7 @@ static int make_child(server_rec * s, in PROCESSOR_CLASS_ANY); if (status != OK) ap_log_error(APLOG_MARK, APLOG_DEBUG, errno, - ap_server_conf, APLOGNO(02667) + ap_server_conf, APLOGNO(00482) "processor unbind failed"); #endif RAISE_SIGSTOP(MAKE_CHILD); @@ -2634,7 +2634,7 @@ static void perform_idle_server_maintena if (active_thread_count >= ap_daemons_limit * threads_per_child) { if (!retained->maxclients_reported) { /* only report this condition once */ - ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(02668) + ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(00484) "server reached MaxRequestWorkers setting, " "consider raising the MaxRequestWorkers " "setting"); @@ -2642,7 +2642,7 @@ static void perform_idle_server_maintena } } else { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(02669) + ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(00485) "scoreboard is full, not at MaxRequestWorkers"); } retained->idle_spawn_rate[child_bucket] = 1; @@ -2652,7 +2652,7 @@ static void perform_idle_server_maintena free_length = retained->idle_spawn_rate[child_bucket]; } if (retained->idle_spawn_rate[child_bucket] >= 8) { - ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(02670) + ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00486) "server seems busy, (you may need " "to increase StartServers, ThreadsPerChild " "or Min/MaxSpareThreads), " @@ -2709,7 +2709,7 @@ static void server_main_loop(int remaini return; } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf, APLOGNO(02671) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf, APLOGNO(00487) "Ignoring fatal error in child of previous " "generation (pid %ld).", (long)pid.pid); @@ -2767,7 +2767,7 @@ static void server_main_loop(int remaini * scoreboard. Somehow we don't know about this child. */ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, - ap_server_conf, APLOGNO(02672) + ap_server_conf, APLOGNO(00488) "long lost child came home! (pid %ld)", (long) pid.pid); } @@ -2848,10 +2848,10 @@ static int event_run(apr_pool_t * _pconf retained->hold_off_on_exponential_spawning = 10; } - ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(02673) + ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00489) "%s configured -- resuming normal operations", ap_get_server_description()); - ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(02674) + ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00490) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); ap_log_common(s); @@ -2875,7 +2875,7 @@ static int event_run(apr_pool_t * _pconf /* 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(02675) "caught SIGTERM, shutting down"); + ap_server_conf, APLOGNO(00491) "caught SIGTERM, shutting down"); } return DONE; } else if (shutdown_pending) { @@ -2896,7 +2896,7 @@ static int event_run(apr_pool_t * _pconf if (!child_fatal) { /* 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(02676) + ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00492) "caught " AP_SIG_GRACEFUL_STOP_STRING ", shutting down gracefully"); } @@ -2954,7 +2954,7 @@ static int event_run(apr_pool_t * _pconf 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(02677) + ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00493) AP_SIG_GRACEFUL_STRING " received. Doing graceful restart"); /* wake up the children...time to die. But we'll have more soon */ @@ -2978,7 +2978,7 @@ static int event_run(apr_pool_t * _pconf ap_reclaim_child_processes(1, /* Start with SIGTERM */ event_note_child_killed); - ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(02678) + ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00494) "SIGHUP received. Attempting to restart"); } @@ -3098,7 +3098,7 @@ static int event_pre_config(apr_pool_t * rv = apr_pollset_create(&event_pollset, 1, plog, APR_POLLSET_WAKEABLE|APR_POLLSET_NOCOPY); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO(02679) + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO(00495) "apr_pollset_create failed; check system or user limits"); return HTTP_INTERNAL_SERVER_ERROR; } @@ -3110,7 +3110,7 @@ static int event_pre_config(apr_pool_t * 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(02680) + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO(00496) "apr_proc_detach failed"); return HTTP_INTERNAL_SERVER_ERROR; } @@ -3146,14 +3146,14 @@ static int event_check_config(apr_pool_t if (server_limit > MAX_SERVER_LIMIT) { if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02681) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00497) "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(02682) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00498) "ServerLimit of %d exceeds compile-time limit " "of %d, decreasing to match", server_limit, MAX_SERVER_LIMIT); @@ -3162,11 +3162,11 @@ static int event_check_config(apr_pool_t } else if (server_limit < 1) { if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02683) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00499) "WARNING: ServerLimit of %d not allowed, " "increasing to 1.", server_limit); } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02684) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00500) "ServerLimit of %d not allowed, increasing to 1", server_limit); } @@ -3181,7 +3181,7 @@ static int event_check_config(apr_pool_t } 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(02685) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00501) "changing ServerLimit to %d from original value of %d " "not allowed during restart", server_limit, retained->first_server_limit); @@ -3190,14 +3190,14 @@ static int event_check_config(apr_pool_t if (thread_limit > MAX_THREAD_LIMIT) { if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02686) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00502) "WARNING: ThreadLimit of %d exceeds compile-time " "limit of", thread_limit); ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, " %d threads, decreasing to %d.", MAX_THREAD_LIMIT, MAX_THREAD_LIMIT); } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02687) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00503) "ThreadLimit of %d exceeds compile-time limit " "of %d, decreasing to match", thread_limit, MAX_THREAD_LIMIT); @@ -3206,11 +3206,11 @@ static int event_check_config(apr_pool_t } else if (thread_limit < 1) { if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02688) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00504) "WARNING: ThreadLimit of %d not allowed, " "increasing to 1.", thread_limit); } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02689) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00505) "ThreadLimit of %d not allowed, increasing to 1", thread_limit); } @@ -3225,7 +3225,7 @@ static int event_check_config(apr_pool_t } else if (thread_limit != retained->first_thread_limit) { /* don't need a startup console version here */ - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02690) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00506) "changing ThreadLimit to %d from original value of %d " "not allowed during restart", thread_limit, retained->first_thread_limit); @@ -3234,7 +3234,7 @@ static int event_check_config(apr_pool_t if (threads_per_child > thread_limit) { if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02691) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00507) "WARNING: ThreadsPerChild of %d exceeds ThreadLimit " "of", threads_per_child); ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, @@ -3244,7 +3244,7 @@ static int event_check_config(apr_pool_t " To increase, please see the ThreadLimit " "directive."); } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02692) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00508) "ThreadsPerChild of %d exceeds ThreadLimit " "of %d, decreasing to match", threads_per_child, thread_limit); @@ -3253,11 +3253,11 @@ static int event_check_config(apr_pool_t } else if (threads_per_child < 1) { if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02693) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00509) "WARNING: ThreadsPerChild of %d not allowed, " "increasing to 1.", threads_per_child); } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02694) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00510) "ThreadsPerChild of %d not allowed, increasing to 1", threads_per_child); } @@ -3266,7 +3266,7 @@ static int event_check_config(apr_pool_t if (max_workers < threads_per_child) { if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02695) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00511) "WARNING: MaxRequestWorkers of %d is less than " "ThreadsPerChild of", max_workers); ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, @@ -3276,7 +3276,7 @@ static int event_check_config(apr_pool_t ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, " as the number of threads in a single server."); } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02696) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00512) "MaxRequestWorkers of %d is less than ThreadsPerChild " "of %d, increasing to match", max_workers, threads_per_child); @@ -3290,7 +3290,7 @@ static int event_check_config(apr_pool_t int tmp_max_workers = ap_daemons_limit * threads_per_child; if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02697) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00513) "WARNING: MaxRequestWorkers of %d is not an integer " "multiple of", max_workers); ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, @@ -3301,7 +3301,7 @@ static int event_check_config(apr_pool_t " for a maximum of %d servers.", ap_daemons_limit); } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02698) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00514) "MaxRequestWorkers of %d is not an integer multiple " "of ThreadsPerChild of %d, decreasing to nearest " "multiple %d", max_workers, threads_per_child, @@ -3312,7 +3312,7 @@ static int event_check_config(apr_pool_t if (ap_daemons_limit > server_limit) { if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02699) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00515) "WARNING: MaxRequestWorkers of %d would require %d " "servers and ", max_workers, ap_daemons_limit); ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, @@ -3322,7 +3322,7 @@ static int event_check_config(apr_pool_t " To increase, please see the ServerLimit " "directive."); } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02700) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00516) "MaxRequestWorkers of %d would require %d servers and " "exceed ServerLimit of %d, decreasing to %d", max_workers, ap_daemons_limit, server_limit, @@ -3334,11 +3334,11 @@ static int event_check_config(apr_pool_t /* ap_daemons_to_start > ap_daemons_limit checked in ap_mpm_run() */ if (ap_daemons_to_start < 0) { if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02701) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00517) "WARNING: StartServers of %d not allowed, " "increasing to 1.", ap_daemons_to_start); } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02702) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00518) "StartServers of %d not allowed, increasing to 1", ap_daemons_to_start); } @@ -3347,7 +3347,7 @@ static int event_check_config(apr_pool_t if (min_spare_threads < 1) { if (startup) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(02703) + ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00519) "WARNING: MinSpareThreads of %d not allowed, " "increasing to 1", min_spare_threads); ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, @@ -3355,7 +3355,7 @@ static int event_check_config(apr_pool_t 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(02704) + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00520) "MinSpareThreads of %d not allowed, increasing to 1", min_spare_threads); } @@ -3436,7 +3436,7 @@ static const char *set_max_workers(cmd_p return err; } if (!strcasecmp(cmd->cmd->name, "MaxClients")) { - ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, APLOGNO(02705) + ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, APLOGNO(00521) "MaxClients is deprecated, use MaxRequestWorkers " "instead."); }