Fix the naming of the apr_threadattr_detach_xxx functions. get and set were

reversed.

This may have broken the Unix threaded mpm's when they started using the
bogus "set" function.  A likely symptom would be failure to stop a threaded
process cleanly.

Note: it appears these functions are essentially no-ops except in Unix.

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

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index edf3083ab4540462c948ddcf5a80ff404401ba3c..d08bb769a716bd137df90b7436f6c3f52fda8932 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -917,7 +917,7 @@ static void child_main(int child_num_arg)
                     NULL, pchild);
 
     apr_threadattr_create(&worker_thread_attr, pchild);
-    apr_threadattr_detach_set(worker_thread_attr);                                     
+    apr_threadattr_detach_set(worker_thread_attr, 1);                                     
     apr_create_signal_thread(&thread, worker_thread_attr, check_signal, pchild);
 
     /* We are creating worker threads right now */

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index edf3083ab4540462c948ddcf5a80ff404401ba3c..d08bb769a716bd137df90b7436f6c3f52fda8932 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -917,7 +917,7 @@ static void child_main(int child_num_arg)
                     NULL, pchild);
 
     apr_threadattr_create(&worker_thread_attr, pchild);
-    apr_threadattr_detach_set(worker_thread_attr);                                     
+    apr_threadattr_detach_set(worker_thread_attr, 1);                                     
     apr_create_signal_thread(&thread, worker_thread_attr, check_signal, pchild);
 
     /* We are creating worker threads right now */

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index 4a0a3f7a53f94f92e693cb7c1989aa3cb1c1ef78..96bfada8424cc22ffbea700d57a4164f68e10677 100644 (file)
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -657,7 +657,7 @@ static void child_main(int child_num_arg)
     apr_lock_create(&pipe_of_death_mutex, APR_MUTEX, APR_INTRAPROCESS, 
                     NULL, pchild);
     apr_threadattr_create(&thread_attr, pchild);
-    apr_threadattr_detach_set(thread_attr);
+    apr_threadattr_detach_set(thread_attr, 1);
 
     rv = apr_create_signal_thread(&thread, thread_attr, check_signal, pchild);
     if (rv != APR_SUCCESS) {