You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2009/11/21 18:18:39 UTC
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
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"