Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 92755 invoked from network); 21 Nov 2009 17:19:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Nov 2009 17:19:05 -0000 Received: (qmail 81651 invoked by uid 500); 21 Nov 2009 17:19:04 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 81557 invoked by uid 500); 21 Nov 2009 17:19:04 -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 81548 invoked by uid 99); 21 Nov 2009 17:19:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Nov 2009 17:19:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sat, 21 Nov 2009 17:19:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6745C23888DD; Sat, 21 Nov 2009 17:18:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r882943 - in /httpd/httpd/trunk/server/mpm: event/mpm_default.h mpmt_os2/mpmt_os2.c netware/mpm_default.h netware/mpm_netware.c simple/mpm_default.h Date: Sat, 21 Nov 2009 17:18:39 -0000 To: cvs@httpd.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091121171840.6745C23888DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Sat Nov 21 17:18:39 2009 New Revision: 882943 URL: http://svn.apache.org/viewvc?rev=882943&view=rev Log: remove dead code related to the accept mutex Modified: httpd/httpd/trunk/server/mpm/event/mpm_default.h httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c httpd/httpd/trunk/server/mpm/netware/mpm_default.h httpd/httpd/trunk/server/mpm/netware/mpm_netware.c httpd/httpd/trunk/server/mpm/simple/mpm_default.h Modified: httpd/httpd/trunk/server/mpm/event/mpm_default.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/mpm_default.h?rev=882943&r1=882942&r2=882943&view=diff ============================================================================== --- httpd/httpd/trunk/server/mpm/event/mpm_default.h (original) +++ httpd/httpd/trunk/server/mpm/event/mpm_default.h Sat Nov 21 17:18:39 2009 @@ -51,11 +51,6 @@ #define DEFAULT_THREADS_PER_CHILD 25 #endif -/* File used for accept locking, when we use a file */ -#ifndef DEFAULT_LOCKFILE -#define DEFAULT_LOCKFILE DEFAULT_REL_RUNTIMEDIR "/accept.lock" -#endif - /* Where the main/parent process's pid is logged */ #ifndef DEFAULT_PIDLOG #define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid" Modified: httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c?rev=882943&r1=882942&r2=882943&view=diff ============================================================================== --- httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c (original) +++ httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c Sat Nov 21 17:18:39 2009 @@ -272,12 +272,6 @@ ap_get_server_description()); ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, "Server built: %s", ap_get_server_built()); -#ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, - "AcceptMutex: %s (default: %s)", - apr_proc_mutex_name(accept_mutex), - apr_proc_mutex_defname()); -#endif if (one_process) { ap_scoreboard_image->parent[0].pid = getpid(); ap_mpm_child_main(pconf); Modified: httpd/httpd/trunk/server/mpm/netware/mpm_default.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/netware/mpm_default.h?rev=882943&r1=882942&r2=882943&view=diff ============================================================================== --- httpd/httpd/trunk/server/mpm/netware/mpm_default.h (original) +++ httpd/httpd/trunk/server/mpm/netware/mpm_default.h Sat Nov 21 17:18:39 2009 @@ -86,12 +86,6 @@ #define DEFAULT_REL_RUNTIMEDIR "logs" #endif -/* File used for accept locking, when we use a file */ -/*#ifndef DEFAULT_LOCKFILE - #define DEFAULT_LOCKFILE DEFAULT_REL_RUNTIMEDIR "/accept.lock" - #endif -*/ - /* Where the main/parent process's pid is logged */ /*#ifndef DEFAULT_PIDLOG #define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid" Modified: httpd/httpd/trunk/server/mpm/netware/mpm_netware.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/netware/mpm_netware.c?rev=882943&r1=882942&r2=882943&view=diff ============================================================================== --- httpd/httpd/trunk/server/mpm/netware/mpm_netware.c (original) +++ httpd/httpd/trunk/server/mpm/netware/mpm_netware.c Sat Nov 21 17:18:39 2009 @@ -922,12 +922,6 @@ ap_get_server_description()); ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, "Server built: %s", ap_get_server_built()); -#ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, - "AcceptMutex: %s (default: %s)", - apr_proc_mutex_name(accept_mutex), - apr_proc_mutex_defname()); -#endif show_server_data(); mpm_state = AP_MPMQ_RUNNING; Modified: httpd/httpd/trunk/server/mpm/simple/mpm_default.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/mpm_default.h?rev=882943&r1=882942&r2=882943&view=diff ============================================================================== --- httpd/httpd/trunk/server/mpm/simple/mpm_default.h (original) +++ httpd/httpd/trunk/server/mpm/simple/mpm_default.h Sat Nov 21 17:18:39 2009 @@ -51,11 +51,6 @@ #define DEFAULT_THREADS_PER_CHILD 25 #endif -/* File used for accept locking, when we use a file */ -#ifndef DEFAULT_LOCKFILE -#define DEFAULT_LOCKFILE DEFAULT_REL_RUNTIMEDIR "/accept.lock" -#endif - /* Where the main/parent process's pid is logged */ #ifndef DEFAULT_PIDLOG #define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"