You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/08/29 21:17:45 UTC
svn commit: r1621367 - in /httpd/httpd/trunk: CHANGES
docs/log-message-tags/next-number modules/proxy/mod_proxy.h
modules/proxy/proxy_util.c
Author: jim
Date: Fri Aug 29 19:17:45 2014
New Revision: 1621367
URL: http://svn.apache.org/r1621367
Log:
PR53218
Allow for longer worker names and make truncation a non-fatal
error...
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/docs/log-message-tags/next-number
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1621367&r1=1621366&r2=1621367&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Aug 29 19:17:45 2014
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
-
+
+ *) mod_proxy: Now allow for 191 character worker names, with non-fatal
+ errors if name is truncated. PR53218. [Jim Jagielski]
+
*) mod_ssl: Add optional function "ssl_get_tls_cb" to allow support
for channel bindings. [Simo Sorce <simo redhat.com>]
Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1621367&r1=1621366&r2=1621367&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Fri Aug 29 19:17:45 2014
@@ -1 +1 @@
-2808
+2809
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1621367&r1=1621366&r2=1621367&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Fri Aug 29 19:17:45 2014
@@ -317,7 +317,7 @@ PROXY_WORKER_DISABLED | PROXY_WORKER_STO
#define PROXY_WORKER_MAX_SCHEME_SIZE 16
#define PROXY_WORKER_MAX_ROUTE_SIZE 96
#define PROXY_BALANCER_MAX_ROUTE_SIZE 64
-#define PROXY_WORKER_MAX_NAME_SIZE 96
+#define PROXY_WORKER_MAX_NAME_SIZE 192
#define PROXY_BALANCER_MAX_NAME_SIZE 64
#define PROXY_WORKER_MAX_HOSTNAME_SIZE 96
#define PROXY_BALANCER_MAX_HOSTNAME_SIZE 64
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1621367&r1=1621366&r2=1621367&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Fri Aug 29 19:17:45 2014
@@ -1733,7 +1733,8 @@ PROXY_DECLARE(char *) ap_proxy_define_wo
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_ALERT, 0, ap_server_conf, APLOGNO(2808)
+ "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);