get the MPMs consistent w.r.t. visibility of ap_max_requests_per_child

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89051 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index c0128df9b52a9067aca194b45cdbeb044ce97aae..fcbb638c77d2ccbeff6157cf38e62c42f8a4081d 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -90,7 +90,7 @@
  */
 
 int ap_threads_per_child=HARD_THREAD_LIMIT;         /* Worker threads per child */
-int ap_max_requests_per_child=0;
+static int ap_max_requests_per_child=0;
 static const char *ap_pid_fname=NULL;
 static int ap_threads_to_start=0;
 static int min_spare_threads=0;

diff --git a/server/mpm/beos/beos.h b/server/mpm/beos/beos.h
index 4b37a65ec99ffd5e93d7fb117a6e0b50f939c68b..b942bf9efcaedb6241c7ef18e8aae1e1bfb62dab 100644 (file)
--- a/server/mpm/beos/beos.h
+++ b/server/mpm/beos/beos.h
@@ -60,7 +60,6 @@
 #define APACHE_MPM_BEOS_H
 
 extern int ap_threads_per_child;
-extern int ap_max_requests_per_child;
 extern int ap_pipe_of_death[2];
 extern int ap_extended_status;
 extern void clean_child_exit(int);

diff --git a/server/mpm/threaded/mpm.h b/server/mpm/threaded/mpm.h
index 3359f8cca5f4ed035ff9518483ca7382b313958f..51a3965ce3cdc1642a491f013d458f15bd4374cb 100644 (file)
--- a/server/mpm/threaded/mpm.h
+++ b/server/mpm/threaded/mpm.h
@@ -71,7 +71,6 @@
 #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
 
 extern int ap_threads_per_child;
-extern int ap_max_requests_per_child;
 extern int ap_max_daemons_limit;
 extern server_rec *ap_server_conf;
 extern char ap_coredump_dir[MAX_STRING_LEN];

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index 05e29a781b83f268f5181a46602b1fb2aeec340b..c90b7d19dc0fbc68299d3072b12a693544b53ee4 100644 (file)
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -100,7 +100,7 @@
  */
 
 int ap_threads_per_child=0;         /* Worker threads per child */
-int ap_max_requests_per_child=0;
+static int ap_max_requests_per_child=0;
 static const char *ap_pid_fname=NULL;
 static int ap_daemons_to_start=0;
 static int min_spare_threads=0;

diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index cec0a64ce4ae6646b732bcf0e4d4cce19e192977..c4839bdcae8132659516de2cfcf39fdb60e276da 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -112,7 +112,6 @@ void mpm_start_child_console_handler(void);
 /* From winnt.c: */
 
 extern OSVERSIONINFO osver;
-extern int ap_max_requests_per_child;
 extern void clean_child_exit(int);
 
 AP_DECLARE(void) ap_start_shutdown(void);

diff --git a/support/httpd.exp b/support/httpd.exp
index 04581acf529d1e2bbe384b1045a9d3ec8a119dfe..29a0b4d1841da65f4cb9b646c95a8e399c2238fb 100644 (file)
--- a/support/httpd.exp
+++ b/support/httpd.exp
@@ -198,7 +198,6 @@ ap_make_etag
 ap_make_full_path
 ap_make_method_list
 ap_matches_request_vhost
-ap_max_requests_per_child
 ap_md5
 ap_md5_binary
 ap_md5contextTo64