Commit 4b6afc2e authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

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
parent 501bad24

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 


Changes with Apache 2.3.14



  *) core, mod_rewrite, mod_ssl, mod_nw_ssl: Make the SERVER_NAME variable

     include [ ] for literal IPv6 addresses, as mandated by RFC 3875.

     PR 26005. [Stefan Fritsch]



  *) mod_negotiation: Fix parsing of Content-Length in type maps. PR 42203.

     [Nagae Hidetake <nagae eagan jp>]

modules/arch/netware/mod_nw_ssl.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,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"))

modules/mappers/mod_rewrite.c

+1 −1
Original line number Diff line number Diff line
@@ -1963,7 +1963,7 @@ static char *lookup_variable(char *var, rewrite_ctx *ctx) 
            switch (var[8]) {

            case 'A':

                if (!strcmp(var, "SERVER_NAME")) {

                    result = ap_get_server_name(r);

                    result = ap_get_server_name_for_url(r);

                }

                break;

modules/ssl/ssl_engine_vars.c

+1 −1
Original line number Diff line number Diff line
@@ -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"))

server/util_expr_eval.c

+1 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static const char *request_var_fn(ap_expr_eval_ctx_t *ctx, const void *data) 
    case 7:

        return r->server->server_admin;

    case 8:

        return ap_get_server_name(r);

        return ap_get_server_name_for_url(r);

    case 9:

        return apr_psprintf(ctx->p, "%u", ap_get_server_port(r));

    case 10: