From: Christophe Jaillet <jailletc36@apache.org>
Date: Thu, 23 Sep 2021 20:18:23 +0000 (+0000)
Subject: Tentative update to reduce noise in travis log (i.e. tons of AH02637).
X-Git-Tag: 2.5.0-alpha2-ci-test-only~786
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1032155c5720e167446efceb4b8e0b545851b7a4;p=thirdparty%2Fapache%2Fhttpd.git

Tentative update to reduce noise in travis log (i.e. tons of AH02637).

Just switch 2 tests in 'dialup_handler()' when deciding to DECLINE something.

If mod_dialup is not configured, there is no need lo log anything about an
mpm that doesn't support something that is finally not used.

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

diff --git a/modules/test/mod_dialup.c b/modules/test/mod_dialup.c
index ef80d86c457..5eb508ba5cf 100644
--- a/modules/test/mod_dialup.c
+++ b/modules/test/mod_dialup.c
@@ -157,13 +157,6 @@ dialup_handler(request_rec *r)
         return DECLINED;
     }
 
-    rv = ap_mpm_query(AP_MPMQ_CAN_SUSPEND, &mpm_can_suspend);
-    if (!mpm_can_suspend) {
-        ap_log_rerror (APLOG_MARK, APLOG_NOTICE, rv, r, APLOGNO(02637)
-                "dialup: MPM doesn't support suspending");
-        return DECLINED;
-    }
-
     dcfg = ap_get_module_config(r->per_dir_config,
                                 &dialup_module);
 
@@ -171,6 +164,13 @@ dialup_handler(request_rec *r)
         return DECLINED;
     }
 
+    rv = ap_mpm_query(AP_MPMQ_CAN_SUSPEND, &mpm_can_suspend);
+    if (!mpm_can_suspend) {
+        ap_log_rerror (APLOG_MARK, APLOG_NOTICE, rv, r, APLOGNO(02637)
+                "dialup: MPM doesn't support suspending");
+        return DECLINED;
+    }
+
     ccfg = ap_get_core_module_config(r->per_dir_config);