From: Colm MacCarthaigh <colm@apache.org>
Date: Sun, 2 Oct 2005 20:56:56 +0000 (+0000)
Subject: Merge r265518-9 from trunk; explicit assignment of some global variables
X-Git-Tag: 2.1.9~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e555afb9856b0c4c25fb02055d659a456bd4d35b;p=thirdparty%2Fapache%2Fhttpd.git

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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293164 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c
index 00ed6501e92..3bcdda2023d 100644
--- a/server/mpm/experimental/event/event.c
+++ b/server/mpm/experimental/event/event.c
@@ -146,9 +146,9 @@ static int min_spare_threads = 0;
 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;
diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c
index fb21911889b..f9d6a2c32bf 100644
--- a/server/mpm/experimental/leader/leader.c
+++ b/server/mpm/experimental/leader/leader.c
@@ -114,9 +114,9 @@ static int min_spare_threads = 0;
 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;
diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c
index 1b6031dc7e2..7c9281bf6ef 100644
--- a/server/mpm/experimental/threadpool/threadpool.c
+++ b/server/mpm/experimental/threadpool/threadpool.c
@@ -120,9 +120,9 @@ static int min_spare_threads = 0;
 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;
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 2a59800c8e2..626be419af9 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -97,7 +97,7 @@ static int ap_daemons_min_free=0;
 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;
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 60e373696ff..53db4b24f20 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -120,9 +120,9 @@ static int min_spare_threads = 0;
 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;