Commit 62691a32 authored by Eric Covener's avatar Eric Covener
Browse files

PR59938: add %{REMOTE_PORT} to the expression parser 

Submitted By: Hank Ibell <hwibell gmail.com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776459 13f79535-47bb-0310-9956-ffa450edef68
parent b9c0cf92

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.0

 

  *) core: Add %{REMOTE_PORT} to the expression parser. PR59938

     [Hank Ibell <hwibell gmail.com>]



  *) mod_remoteip: When overriding the useragent address from X-Forwarded-For,

     zero out what had been initialized as the connection-level port.  PR59931.

     [Hank Ibell <hwibell gmail.com>]

docs/manual/expr.xml

+2 −0
Original line number Diff line number Diff line
@@ -230,6 +230,8 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>" 
            "<code>GET /index.html HTTP/1.1</code>")</td></tr>

    <tr><td><code>REMOTE_ADDR</code></td>

        <td>The IP address of the remote host</td></tr>

    <tr><td><code>REMOTE_PORT</code></td>

        <td>The port of the remote host</td></tr>

    <tr><td><code>REMOTE_HOST</code></td>

        <td>The host name of the remote host</td></tr>

    <tr><td><code>REMOTE_USER</code></td>

server/util_expr_eval.c

+3 −0
Original line number Diff line number Diff line
@@ -1456,6 +1456,7 @@ static const char *request_var_names[] = { 
    "SERVER_PROTOCOL_VERSION",  /* 29 */

    "SERVER_PROTOCOL_VERSION_MAJOR",  /* 30 */

    "SERVER_PROTOCOL_VERSION_MINOR",  /* 31 */

    "REMOTE_PORT",                    /* 32 */

    NULL

};
@@ -1562,6 +1563,8 @@ static const char *request_var_fn(ap_expr_eval_ctx_t *ctx, const void *data) 
        case 9:     return "9";

        }

        return apr_psprintf(ctx->p, "%d", HTTP_VERSION_MINOR(r->proto_num));

    case 32:

        return apr_psprintf(ctx->p, "%u", ctx->c->client_addr->port);

    default:

        ap_assert(0);

        return NULL;