From: Jeff Trawick <trawick@apache.org>
Date: Fri, 5 Sep 2003 21:13:22 +0000 (+0000)
Subject: merge this from 2.1-dev:
X-Git-Tag: 2.0.48~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10be0c00e69b1b7b8795073d78fd4bdb9f8a0824;p=thirdparty%2Fapache%2Fhttpd.git

merge this from 2.1-dev:

    Lower the severity of the "listener thread didn't exit" message
    to debug, as it is of interest only to developers.

PR:              9011
Reviewed by:	 stoddard, brianp


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

diff --git a/CHANGES b/CHANGES
index 3befece61b2..6d6cdeea6dc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.48
 
+  *) 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]
+
   *) MPMs: The bucket brigades subsystem now honors the MaxMemFree setting.
      [Cliff Woolley, Jean-Jacques Clar]
 
diff --git a/STATUS b/STATUS
index c53105c8395..d05a19a01bb 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/09/05 20:40:30 $]
+Last modified at [$Date: 2003/09/05 21:13:21 $]
 
 Release:
 
@@ -376,12 +376,6 @@ PATCHES TO PORT FROM 2.1
         server/mpm/worker/worker.c r1.138
       +1: trawick, stoddard, brianp
 
-    * Lower the severity of the "listener thread didn't exit" message
-      to debug, as it is of interest only to developers.
-        server/mpm/experimental/threadpool/threadpool.c r1.20
-        server/mpm/worker/worker.c
-      +1: trawick, stoddard, brianp
-
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,
diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c
index 64f4647e915..3fbdd19f6c8 100644
--- a/server/mpm/experimental/threadpool/threadpool.c
+++ b/server/mpm/experimental/threadpool/threadpool.c
@@ -1270,7 +1270,7 @@ static void join_workers(apr_thread_t *listener, apr_thread_t **threads)
             ++iter;
         }
         if (iter >= 10) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, 0, ap_server_conf,
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
                          "the listener thread didn't exit");
         }
         else {
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index ec7b8e2d2f5..efc1d8acfaf 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1141,7 +1141,7 @@ static void join_workers(apr_thread_t *listener, apr_thread_t **threads)
             ++iter;
         }
         if (iter >= 10) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, 0, ap_server_conf,
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
                          "the listener thread didn't exit");
         }
         else {