summaryrefslogtreecommitdiff
path: root/modules/ssl/ssl_engine_vars.c
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2011-07-17 13:56:28 +0000
committerStefan Fritsch <sf@apache.org>2011-07-17 13:56:28 +0000
commit481fac5ce2f395fb029eb1c92e92835733e3f648 (patch)
treea6de57154acf1039854c7ab69d9d0afb118526c9 /modules/ssl/ssl_engine_vars.c
parent02e91f38f651379d6d80c7898fd466e1666399b8 (diff)
downloadhttpd-481fac5ce2f395fb029eb1c92e92835733e3f648.tar.gz
Make the SERVER_NAME variable include [ ] for literal IPv6 addresses, as
mandated by RFC 3875 PR: 26005 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147614 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl/ssl_engine_vars.c')
-rw-r--r--modules/ssl/ssl_engine_vars.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index 99d3832560..34f33cf2a8 100644
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -203,7 +203,7 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r,
if (strcEQ(var, "SERVER_ADMIN"))
result = r->server->server_admin;
else if (strcEQ(var, "SERVER_NAME"))
- result = ap_get_server_name(r);
+ result = ap_get_server_name_for_url(r);
else if (strcEQ(var, "SERVER_PORT"))
result = apr_psprintf(p, "%u", ap_get_server_port(r));
else if (strcEQ(var, "SERVER_PROTOCOL"))