Merge r1621367, r1621372, r1625952 from trunk:

PR53218
Allow for longer worker names and make truncation a non-fatal
error...

Correct loglevel.

oops... prepend 0

Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index f10f86943174cf7118d997e56e35130ba38cfac8..580b99b09b15283f9ad8b16cc77c563d407c55c8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.11
 
+  *) mod_proxy: Truncated character worker names are no longer fatal
+     errors. PR53218. [Jim Jagielski]
+
   *) mod_dav: Set r->status_line in dav_error_response. PR 55426.
 
   *) SECURITY: CVE-2014-3581 (cve.mitre.org)

diff --git a/STATUS b/STATUS
index f46e044610b9ea07efaff45bc1bcaa15df00bddc..ccb5483e3cc4f73a65dcd5f39c3886bf01e8beeb 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -102,13 +102,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy: Make worker name truncation a non-fatal error.
-     trunk patch: http://svn.apache.org/r1621367
-                  http://svn.apache.org/r1621372
-                  http://svn.apache.org/r1625952
-     2.4.x patch: http://people.apache.org/~jim/patches/worker-trunc.patch
-     +1: jim, ylavic, covener
-
    * default SSL configuration: provide sample OCSP Stapling configuration
      trunk patch: http://svn.apache.org/r1633730
      2.4.x patch: http://people.apache.org/~trawick/2.4.x-sample-ocsp-stapling.txt

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index bc840499c7ba111d1e874703b6dbd4081aee099a..3442a9003683b8655ce515da5acef004c2f0eaa0 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1685,7 +1685,8 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p,
 
     ptr = apr_uri_unparse(p, &uri, APR_URI_UNP_REVEALPASSWORD);
     if (PROXY_STRNCPY(wshared->name, ptr) != APR_SUCCESS) {
-        return apr_psprintf(p, "worker name (%s) too long", ptr);
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(02808)
+        "Alert! worker name (%s) too long; truncated to: %s", ptr, wshared->name);
     }
     if (PROXY_STRNCPY(wshared->scheme, uri.scheme) != APR_SUCCESS) {
         return apr_psprintf(p, "worker scheme (%s) too long", uri.scheme);