httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/beos beos.c
Date Wed, 27 Aug 2003 22:33:12 GMT
bnicholes    2003/08/27 15:33:12

  Modified:    server/mpm/worker worker.c
               server/mpm/experimental/threadpool threadpool.c
               server/mpm/prefork prefork.c
               server/mpm/experimental/perchild perchild.c
               server/mpm/mpmt_os2 mpmt_os2.c
               server/mpm/winnt mpm_winnt.c
               server/mpm/netware mpm_netware.c
               server/mpm/experimental/leader leader.c
               server/mpm/beos beos.c
  Log:
  Make sure that the global ap_max_mem_free is initialized along with the
  other MPM globals whenever HTTPD is started or restarted.
  
  Revision  Changes    Path
  1.136     +3 -0      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.135
  retrieving revision 1.136
  diff -u -r1.135 -r1.136
  --- worker.c	9 Apr 2003 16:58:30 -0000	1.135
  +++ worker.c	27 Aug 2003 22:33:11 -0000	1.136
  @@ -1854,6 +1854,9 @@
       ap_lock_fname = DEFAULT_LOCKFILE;
       ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
       ap_extended_status = 0;
  +#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE
  +	ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
  +#endif
   
       apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
   
  
  
  
  1.17      +3 -0      httpd-2.0/server/mpm/experimental/threadpool/threadpool.c
  
  Index: threadpool.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/threadpool/threadpool.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- threadpool.c	9 Apr 2003 16:58:29 -0000	1.16
  +++ threadpool.c	27 Aug 2003 22:33:11 -0000	1.17
  @@ -1991,6 +1991,9 @@
       ap_lock_fname = DEFAULT_LOCKFILE;
       ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
       ap_extended_status = 0;
  +#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE
  +	ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
  +#endif
   
       apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
   
  
  
  
  1.279     +3 -0      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.278
  retrieving revision 1.279
  diff -u -r1.278 -r1.279
  --- prefork.c	9 Jul 2003 12:24:52 -0000	1.278
  +++ prefork.c	27 Aug 2003 22:33:11 -0000	1.279
  @@ -1219,6 +1219,9 @@
       ap_lock_fname = DEFAULT_LOCKFILE;
       ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
       ap_extended_status = 0;
  +#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE
  +	ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
  +#endif
   
       apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
   
  
  
  
  1.139     +3 -0      httpd-2.0/server/mpm/experimental/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/perchild.c,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- perchild.c	9 Apr 2003 16:58:29 -0000	1.138
  +++ perchild.c	27 Aug 2003 22:33:11 -0000	1.139
  @@ -1544,6 +1544,9 @@
       ap_lock_fname = DEFAULT_LOCKFILE;
       ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
       curr_child_num = 0;
  +#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE
  +	ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
  +#endif
   
       apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
   
  
  
  
  1.25      +3 -0      httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c
  
  Index: mpmt_os2.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mpmt_os2.c	3 Feb 2003 17:53:23 -0000	1.24
  +++ mpmt_os2.c	27 Aug 2003 22:33:11 -0000	1.25
  @@ -512,6 +512,9 @@
       ap_extended_status = 0;
       ap_min_spare_threads = DEFAULT_MIN_SPARE_THREAD;
       ap_max_spare_threads = DEFAULT_MAX_SPARE_THREAD;
  +#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE
  +	ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
  +#endif
   
       return OK;
   }
  
  
  
  1.300     +3 -0      httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.299
  retrieving revision 1.300
  diff -u -r1.299 -r1.300
  --- mpm_winnt.c	4 Mar 2003 22:15:51 -0000	1.299
  +++ mpm_winnt.c	27 Aug 2003 22:33:12 -0000	1.300
  @@ -1408,6 +1408,9 @@
       ap_threads_per_child = DEFAULT_THREADS_PER_CHILD;
       ap_pid_fname = DEFAULT_PIDLOG;
       ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
  +#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE
  +	ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
  +#endif
   
       apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
   
  
  
  
  1.71      +3 -0      httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- mpm_netware.c	3 Jun 2003 19:47:35 -0000	1.70
  +++ mpm_netware.c	27 Aug 2003 22:33:12 -0000	1.71
  @@ -1015,6 +1015,9 @@
       ap_threads_limit = HARD_THREAD_LIMIT;
       ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
       ap_extended_status = 0;
  +#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE
  +	ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
  +#endif
   
       return OK;
   }
  
  
  
  1.29      +3 -0      httpd-2.0/server/mpm/experimental/leader/leader.c
  
  Index: leader.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/leader/leader.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- leader.c	9 Apr 2003 16:58:29 -0000	1.28
  +++ leader.c	27 Aug 2003 22:33:12 -0000	1.29
  @@ -1734,6 +1734,9 @@
       ap_lock_fname = DEFAULT_LOCKFILE;
       ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
       ap_extended_status = 0;
  +#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE
  +	ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
  +#endif
   
       apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
   
  
  
  
  1.101     +3 -0      httpd-2.0/server/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- beos.c	3 Feb 2003 17:53:22 -0000	1.100
  +++ beos.c	27 Aug 2003 22:33:12 -0000	1.101
  @@ -1047,6 +1047,9 @@
       ap_thread_limit = HARD_THREAD_LIMIT;
       ap_pid_fname = DEFAULT_PIDLOG;
       ap_max_requests_per_thread = DEFAULT_MAX_REQUESTS_PER_THREAD;
  +#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE
  +	ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
  +#endif
   
       apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
   
  
  
  

Mime
View raw message