httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Fri, 05 Sep 2003 21:26:57 GMT
trawick     2003/09/05 14:26:57

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               server/mpm/experimental/leader Tag: APACHE_2_0_BRANCH
                        leader.c
               server/mpm/experimental/threadpool Tag: APACHE_2_0_BRANCH
                        threadpool.c
               server/mpm/worker Tag: APACHE_2_0_BRANCH worker.c
  Log:
  merge this from 2.1-dev:
  
        Fix a misleading message from the some of the threaded MPMs when
        MaxClients has to be lowered due to the setting of ServerLimit.
  
  Reviewed by:	stoddard, brianp
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.150 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.149
  retrieving revision 1.988.2.150
  diff -u -r1.988.2.149 -r1.988.2.150
  --- CHANGES	5 Sep 2003 21:13:21 -0000	1.988.2.149
  +++ CHANGES	5 Sep 2003 21:26:55 -0000	1.988.2.150
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.48
   
  +  *) Fix a misleading message from the some of the threaded MPMs when 
  +     MaxClients has to be lowered due to the setting of ServerLimit.  
  +     [Jeff Trawick]
  +
     *) Lower the severity of the "listener thread didn't exit" message
        to debug, as it is of interest only to developers.  PR 9011
        [Jeff Trawick]
  
  
  
  No                   revision
  No                   revision
  1.26.2.3  +1 -1      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.26.2.2
  retrieving revision 1.26.2.3
  diff -u -r1.26.2.2 -r1.26.2.3
  --- leader.c	5 Sep 2003 19:00:52 -0000	1.26.2.2
  +++ leader.c	5 Sep 2003 21:26:56 -0000	1.26.2.3
  @@ -1915,7 +1915,7 @@
                       server_limit);
          ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
                       " Automatically lowering MaxClients to %d.  To increase,",
  -                    server_limit);
  +                    server_limit * ap_threads_per_child);
          ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
                       " please see the ServerLimit directive.");
          ap_daemons_limit = server_limit;
  
  
  
  No                   revision
  No                   revision
  1.14.2.4  +1 -1      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.14.2.3
  retrieving revision 1.14.2.4
  diff -u -r1.14.2.3 -r1.14.2.4
  --- threadpool.c	5 Sep 2003 21:13:22 -0000	1.14.2.3
  +++ threadpool.c	5 Sep 2003 21:26:57 -0000	1.14.2.4
  @@ -2169,7 +2169,7 @@
                       server_limit);
          ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
                       " Automatically lowering MaxClients to %d.  To increase,",
  -                    server_limit);
  +                    server_limit * ap_threads_per_child);
          ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
                       " please see the ServerLimit directive.");
          ap_daemons_limit = server_limit;
  
  
  
  No                   revision
  No                   revision
  1.133.2.4 +1 -1      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.133.2.3
  retrieving revision 1.133.2.4
  diff -u -r1.133.2.3 -r1.133.2.4
  --- worker.c	5 Sep 2003 21:13:22 -0000	1.133.2.3
  +++ worker.c	5 Sep 2003 21:26:57 -0000	1.133.2.4
  @@ -2031,7 +2031,7 @@
                       server_limit);
          ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
                       " Automatically lowering MaxClients to %d.  To increase,",
  -                    server_limit);
  +                    server_limit * ap_threads_per_child);
          ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
                       " please see the ServerLimit directive.");
          ap_daemons_limit = server_limit;
  
  
  

Mime
View raw message