Change the worker_function implementations to accept both parameters,

  the apr private data (apr_thread_t*) and the application private data
  (void*), for the last update to APR.

Submitted by: Aaron Bannert <aaron@ebuilt.com>
Reviewed by: Will Rowe

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

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 28aa933f5563aebd1f0c72b0a9fca9b492ca0202..39a89a3207e874651b5a0c647af97f2326e73219 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -512,7 +512,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, long conn_id)
     }
 }
 
-static void *worker_thread(void *);
+static void *worker_thread(apr_thread_t *, void *);
 
 /* Starts a thread as long as we're below max_threads */
 static int start_thread(void)
@@ -579,7 +579,7 @@ static void check_pipe_of_death(void)
 
 /* idle_thread_count should be incremented before starting a worker_thread */
 
-static void *worker_thread(void *arg)
+static void *worker_thread(apr_thread_t *thd, void *arg)
 {
     apr_socket_t *csd = NULL;
     apr_pool_t *tpool;         /* Pool for this thread           */

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index 28aa933f5563aebd1f0c72b0a9fca9b492ca0202..39a89a3207e874651b5a0c647af97f2326e73219 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -512,7 +512,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, long conn_id)
     }
 }
 
-static void *worker_thread(void *);
+static void *worker_thread(apr_thread_t *, void *);
 
 /* Starts a thread as long as we're below max_threads */
 static int start_thread(void)
@@ -579,7 +579,7 @@ static void check_pipe_of_death(void)
 
 /* idle_thread_count should be incremented before starting a worker_thread */
 
-static void *worker_thread(void *arg)
+static void *worker_thread(apr_thread_t *thd, void *arg)
 {
     apr_socket_t *csd = NULL;
     apr_pool_t *tpool;         /* Pool for this thread           */

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index 266350e28ffa98e7359baeb2d73f10d30f92315e..836ead8c8a2bdd706724260b2d26cd19ed7fbdce 100644 (file)
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -520,7 +520,7 @@ static void check_pipe_of_death(void)
     apr_lock_release(pipe_of_death_mutex);
 }
 
-static void * worker_thread(void * dummy)
+static void * worker_thread(apr_thread_t *thd, void * dummy)
 {
     proc_info * ti = dummy;
     int process_slot = ti->pid;
@@ -671,7 +671,7 @@ static int check_signal(int signum)
     return 0;
 }
 
-static void *start_threads(void * dummy)
+static void *start_threads(apr_thread_t *thd, void * dummy)
 {
     thread_starter *ts = dummy;
     apr_thread_t **threads = ts->threads;