You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2005/10/02 22:57:02 UTC
svn commit: r293164 - in /httpd/httpd/branches/2.2.x/server/mpm:
experimental/event/event.c experimental/leader/leader.c
experimental/threadpool/threadpool.c prefork/prefork.c worker/worker.c
Author: colm
Date: Sun Oct 2 13:56:56 2005
New Revision: 293164
URL: http://svn.apache.org/viewcvs?rev=293164&view=rev
Log:
Merge r265518-9 from trunk; explicit assignment of some global variables
to zero. These should not be neccessary, but help us get around a gcc
(on ia64 at least) optimisation bug. They are harmless anyway.
Modified:
httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c
httpd/httpd/branches/2.2.x/server/mpm/experimental/leader/leader.c
httpd/httpd/branches/2.2.x/server/mpm/experimental/threadpool/threadpool.c
httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c
httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c
Modified: httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c?rev=293164&r1=293163&r2=293164&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c Sun Oct 2 13:56:56 2005
@@ -146,9 +146,9 @@
static int max_spare_threads = 0;
static int ap_daemons_limit = 0;
static int server_limit = DEFAULT_SERVER_LIMIT;
-static int first_server_limit;
+static int first_server_limit = 0;
static int thread_limit = DEFAULT_THREAD_LIMIT;
-static int first_thread_limit;
+static int first_thread_limit = 0;
static int changed_limit_at_restart;
static int dying = 0;
static int workers_may_exit = 0;
Modified: httpd/httpd/branches/2.2.x/server/mpm/experimental/leader/leader.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/experimental/leader/leader.c?rev=293164&r1=293163&r2=293164&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/experimental/leader/leader.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/experimental/leader/leader.c Sun Oct 2 13:56:56 2005
@@ -114,9 +114,9 @@
static int max_spare_threads = 0;
static int ap_daemons_limit = 0;
static int server_limit = DEFAULT_SERVER_LIMIT;
-static int first_server_limit;
+static int first_server_limit = 0;
static int thread_limit = DEFAULT_THREAD_LIMIT;
-static int first_thread_limit;
+static int first_thread_limit = 0;
static int changed_limit_at_restart;
static int dying = 0;
static int workers_may_exit = 0;
Modified: httpd/httpd/branches/2.2.x/server/mpm/experimental/threadpool/threadpool.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/experimental/threadpool/threadpool.c?rev=293164&r1=293163&r2=293164&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/experimental/threadpool/threadpool.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/experimental/threadpool/threadpool.c Sun Oct 2 13:56:56 2005
@@ -120,9 +120,9 @@
static int max_spare_threads = 0;
static int ap_daemons_limit = 0;
static int server_limit = DEFAULT_SERVER_LIMIT;
-static int first_server_limit;
+static int first_server_limit = 0;
static int thread_limit = DEFAULT_THREAD_LIMIT;
-static int first_thread_limit;
+static int first_thread_limit = 0;
static int changed_limit_at_restart;
static int dying = 0;
static int workers_may_exit = 0;
Modified: httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c?rev=293164&r1=293163&r2=293164&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c Sun Oct 2 13:56:56 2005
@@ -97,7 +97,7 @@
static int ap_daemons_max_free=0;
static int ap_daemons_limit=0; /* MaxClients */
static int server_limit = DEFAULT_SERVER_LIMIT;
-static int first_server_limit;
+static int first_server_limit = 0;
static int changed_limit_at_restart;
static int mpm_state = AP_MPMQ_STARTING;
static ap_pod_t *pod;
Modified: httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c?rev=293164&r1=293163&r2=293164&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c Sun Oct 2 13:56:56 2005
@@ -120,9 +120,9 @@
static int max_spare_threads = 0;
static int ap_daemons_limit = 0;
static int server_limit = DEFAULT_SERVER_LIMIT;
-static int first_server_limit;
+static int first_server_limit = 0;
static int thread_limit = DEFAULT_THREAD_LIMIT;
-static int first_thread_limit;
+static int first_thread_limit = 0;
static int changed_limit_at_restart;
static int dying = 0;
static int workers_may_exit = 0;