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

too-long worker schemes and/or hostnames are no longer fatal errors

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1823482 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2018-02-07 15:38:23 +00:00
parent 2497cbf686
commit a7c10a97f4
3 changed files with 8 additions and 3 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.1 Changes with Apache 2.5.1
*) mod_proxy: Worker schemes and hostnames which are too large are no
longer fatal errors; it is logged and the truncated values are stored.
*) core: adding AP_DECLARE for ap_parse_vhost_addrs() and minor bumb mmn. Resolves *) core: adding AP_DECLARE for ap_parse_vhost_addrs() and minor bumb mmn. Resolves
building mod_ssl on Windows. [Stefan Eissing, Gregg Smith] building mod_ssl on Windows. [Stefan Eissing, Gregg Smith]

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

@@ -1 +1 @@
10117 10119

6
modules/proxy/proxy_util.c
View File

@@ -1724,10 +1724,12 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p,
"Alert! worker name (%s) too long; truncated to: %s", ptr, wshared->name); "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); 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) { if (PROXY_STRNCPY(wshared->hostname, uri.hostname) != APR_SUCCESS) {
return apr_psprintf(p, "worker hostname (%s) too long", uri.hostname); 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);
} }
wshared->flush_packets = flush_off; wshared->flush_packets = flush_off;
wshared->flush_wait = PROXY_FLUSH_WAIT; wshared->flush_wait = PROXY_FLUSH_WAIT;