From: Stefan Fritsch <sf@apache.org>
Date: Tue, 8 Jun 2010 19:41:01 +0000 (+0000)
Subject: Fix the test of ap_mpm_query's result:
X-Git-Tag: 2.3.6~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78af971222c03d4917d8e669d5890e34633d35d0;p=apache

Fix the test of ap_mpm_query's result:
Both AP_MPMQ_STATIC and AP_MPMQ_DYNAMIC mean threaded.


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

diff --git a/server/log.c b/server/log.c
index 7ae287b2d8..b6ce1b6802 100644
--- a/server/log.c
+++ b/server/log.c
@@ -633,8 +633,8 @@ static void log_error_core(const char *file, int line, int module_index,
         {
             int result;
 
-            if (ap_mpm_query(AP_MPMQ_IS_THREADED, &result) == 0
-                && result == AP_MPMQ_STATIC) {
+            if (ap_mpm_query(AP_MPMQ_IS_THREADED, &result) == APR_SUCCESS
+                && result != AP_MPMQ_NOT_SUPPORTED) {
                 apr_os_thread_t tid = apr_os_thread_current();
                 len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
                                     ":tid %pT", &tid);