httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r758671 - in /httpd/httpd/trunk: include/mpm_common.h server/mpm/beos/beos.c server/mpm/netware/mpm_netware.c
Date Thu, 26 Mar 2009 15:04:18 GMT
Author: trawick
Date: Thu Mar 26 15:03:57 2009
New Revision: 758671

URL: http://svn.apache.org/viewvc?rev=758671&view=rev
Log:
axe the unnecessary AP_MPM_HARD_LIMITS_FILE

Modified:
    httpd/httpd/trunk/include/mpm_common.h
    httpd/httpd/trunk/server/mpm/beos/beos.c
    httpd/httpd/trunk/server/mpm/netware/mpm_netware.c

Modified: httpd/httpd/trunk/include/mpm_common.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/mpm_common.h?rev=758671&r1=758670&r2=758671&view=diff
==============================================================================
--- httpd/httpd/trunk/include/mpm_common.h (original)
+++ httpd/httpd/trunk/include/mpm_common.h Thu Mar 26 15:03:57 2009
@@ -193,8 +193,6 @@
 AP_DECLARE(gid_t) ap_gname2id(const char *name);
 #endif
 
-#define AP_MPM_HARD_LIMITS_FILE APACHE_MPM_DIR "/mpm_default.h"
-
 typedef struct ap_pod_t ap_pod_t;
 
 struct ap_pod_t {

Modified: httpd/httpd/trunk/server/mpm/beos/beos.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/beos/beos.c?rev=758671&r1=758670&r2=758671&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/beos/beos.c (original)
+++ httpd/httpd/trunk/server/mpm/beos/beos.c Thu Mar 26 15:03:57 2009
@@ -54,6 +54,8 @@
 #include "apr_thread_mutex.h"
 #include "apr_poll.h"
 
+#define MPM_HARD_LIMITS_FILE APACHE_MPM_DIR "/mpm_default.h"
+
 extern int _kset_fd_limit_(int num);
 
 /* Limit on the total --- clients will be locked out if more servers than
@@ -1105,7 +1107,7 @@
                          " To increase, please see the HARD_THREAD_LIMIT"
                          "define in");
             ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL,
-                         " server/mpm/beos%s.", AP_MPM_HARD_LIMITS_FILE);
+                         " server/mpm/beos%s.", MPM_HARD_LIMITS_FILE);
         } else {
             ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
                          "MaxClients of %d exceeds compile-time limit "

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=758671&r1=758670&r2=758671&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/netware/mpm_netware.c (original)
+++ httpd/httpd/trunk/server/mpm/netware/mpm_netware.c Thu Mar 26 15:03:57 2009
@@ -106,6 +106,8 @@
 #define WORKER_READY        SERVER_READY
 #define WORKER_IDLE_KILL    SERVER_IDLE_KILL
 
+#define MPM_HARD_LIMITS_FILE APACHE_MPM_DIR "/mpm_default.h"
+
 /* config globals */
 
 int ap_threads_per_child=0;         /* Worker threads per child */
@@ -1020,7 +1022,7 @@
                          " To increase, please see the HARD_THREAD_LIMIT"
                          "define in");
             ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL,
-                         " server/mpm/netware%s.", AP_MPM_HARD_LIMITS_FILE);
+                         " server/mpm/netware%s.", MPM_HARD_LIMITS_FILE);
         } else {
             ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
                          "MaxThreads of %d exceeds compile-time limit "



Mime
View raw message