You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2016/03/01 13:35:01 UTC
svn commit: r1733056 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.h
proxy_util.c
Author: ylavic
Date: Tue Mar 1 12:35:01 2016
New Revision: 1733056
URL: http://svn.apache.org/viewvc?rev=1733056&view=rev
Log:
mod_proxy: follow up to r1729826 + r1729847 + r1732986.
Don't use magic constants.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1733056&r1=1733055&r2=1733056&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Tue Mar 1 12:35:01 2016
@@ -349,6 +349,11 @@ PROXY_WORKER_HC_FAIL )
#define PROXY_BALANCER_MAX_HOSTNAME_SIZE 64
#define PROXY_BALANCER_MAX_STICKY_SIZE 64
+/* RFC-1035 mentions limits of 255 for host-names and 253 for domain-names,
+ * dotted together(?) this would fit the below size (+ trailing NUL).
+ */
+#define PROXY_WORKER_RFC1035_NAME_SIZE 512
+
#define PROXY_MAX_PROVIDER_NAME_SIZE 16
#define PROXY_STRNCPY(dst, src) ap_proxy_strncpy((dst), (src), (sizeof(dst)))
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1733056&r1=1733055&r2=1733056&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Tue Mar 1 12:35:01 2016
@@ -2721,7 +2721,7 @@ PROXY_DECLARE(int) ap_proxy_connect_back
* restore any ssl_hostname for this connection set earlier by
* ap_proxy_determine_connection().
*/
- char ssl_hostname[512]; /* host+domain names max (rfc1035-2.3.4) */
+ char ssl_hostname[PROXY_WORKER_RFC1035_NAME_SIZE];
if (!conn->ssl_hostname || PROXY_STRNCPY(ssl_hostname,
conn->ssl_hostname)) {
ssl_hostname[0] = '\0';