From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 12 Apr 2016 22:43:00 +0000 (+0000)
Subject: mod_proxy: really return an error message on invalid "flusher" value.
X-Git-Tag: 2.5.0-alpha~1751
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e0d0b608f825b3830f3c1ad06b1a6b8bc677193;p=apache

mod_proxy: really return an error message on invalid "flusher" value.

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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index dcd185367f..456a528b8f 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -303,10 +303,10 @@ static const char *set_worker_param(apr_pool_t *p,
         worker->s->conn_timeout_set = 1;
     }
     else if (!strcasecmp(key, "flusher")) {
-        if (strlen(val) >= sizeof(worker->s->flusher))
-            apr_psprintf(p, "flusher name length must be < %d characters",
-                    (int)sizeof(worker->s->flusher));
-        PROXY_STRNCPY(worker->s->flusher, val);
+        if (PROXY_STRNCPY(worker->s->flusher, val) != APR_SUCCESS) {
+            return apr_psprintf(p, "flusher name length must be < %d characters",
+                                (int)sizeof(worker->s->flusher));
+        }
     }
     else {
         if (set_worker_hc_param_f) {