www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

PR53218

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1621367 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2014-08-29 19:17:45 +00:00
parent d429875404
commit 6be32ac353
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,6 +1,9 @@
-*- coding: utf-8 -*- -*- coding: utf-8 -*-
Changes with Apache 2.5.0 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 *) mod_ssl: Add optional function "ssl_get_tls_cb" to allow support
for channel bindings. [Simo Sorce <simo redhat.com>] for channel bindings. [Simo Sorce <simo redhat.com>]

2
docs/log-message-tags/next-number
View File

@@ -1 +1 @@
2808 2809

2
modules/proxy/mod_proxy.h
View File

@@ -317,7 +317,7 @@ PROXY_WORKER_DISABLED | PROXY_WORKER_STOPPED | PROXY_WORKER_IN_ERROR )
#define PROXY_WORKER_MAX_SCHEME_SIZE 16 #define PROXY_WORKER_MAX_SCHEME_SIZE 16
#define PROXY_WORKER_MAX_ROUTE_SIZE 96 #define PROXY_WORKER_MAX_ROUTE_SIZE 96
#define PROXY_BALANCER_MAX_ROUTE_SIZE 64 #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_BALANCER_MAX_NAME_SIZE 64
#define PROXY_WORKER_MAX_HOSTNAME_SIZE 96 #define PROXY_WORKER_MAX_HOSTNAME_SIZE 96
#define PROXY_BALANCER_MAX_HOSTNAME_SIZE 64 #define PROXY_BALANCER_MAX_HOSTNAME_SIZE 64

3
modules/proxy/proxy_util.c
View File

@@ -1733,7 +1733,8 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p,
ptr = apr_uri_unparse(p, &uri, APR_URI_UNP_REVEALPASSWORD); ptr = apr_uri_unparse(p, &uri, APR_URI_UNP_REVEALPASSWORD);
if (PROXY_STRNCPY(wshared->name, ptr) != APR_SUCCESS) { 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) { if (PROXY_STRNCPY(wshared->scheme, uri.scheme) != APR_SUCCESS) {
return apr_psprintf(p, "worker scheme (%s) too long", uri.scheme); return apr_psprintf(p, "worker scheme (%s) too long", uri.scheme);