]> granicus.if.org Git - apache/commitdiff
Tone down the message that worker hostname is too long noting it only
authorGraham Leggett <minfrin@apache.org>
Fri, 16 Feb 2018 12:55:49 +0000 (12:55 +0000)
committerGraham Leggett <minfrin@apache.org>
Fri, 16 Feb 2018 12:55:49 +0000 (12:55 +0000)
affects legacy modules not yet using hostname_ex.

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

modules/proxy/proxy_util.c

index f83c5577c8266f03e233877b8e99ddbf7aaa197a..3c81c8b65e89c8ebd1999f5b80265569db2de0dd 100644 (file)
@@ -1727,13 +1727,14 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p,
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(010117)
         "Alert! worker scheme (%s) too long; truncated to: %s", uri.scheme, wshared->scheme);
     }
-    if (PROXY_STRNCPY(wshared->hostname, uri.hostname) != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(010118)
-        "Alert! worker hostname (%s) too long; truncated to: %s", uri.hostname, wshared->hostname);
-    }
     if (PROXY_STRNCPY(wshared->hostname_ex, uri.hostname) != APR_SUCCESS) {
         return apr_psprintf(p, "worker hostname (%s) too long", uri.hostname);
     }
+    if (PROXY_STRNCPY(wshared->hostname, uri.hostname) != APR_SUCCESS) {
+        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(010118)
+        "worker hostname (%s) too long; truncated for legacy modules that do not use "
+        "proxy_worker_shared->hostname_ex: %s", uri.hostname, wshared->hostname);
+    }
     wshared->flush_packets = flush_off;
     wshared->flush_wait = PROXY_FLUSH_WAIT;
     wshared->is_address_reusable = 1;