Commit e1fac1db authored by Graham Leggett's avatar Graham Leggett
Browse files

Further clarify the naming of the entity that originates the request by 

calling that entity a useragent instead of a client.


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

docs/manual/developer/new_api_2_4.xml

+4 −4
Changes for docs/manual/developer/new_api_2_4.xml: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -466,11 +466,11 @@ 
      variables, they need to be replaced with one of the following two

      options as appropriate for the module:

      <ul>

        <li>When you require the IP address of the client, which might

        be connected directly to the server, or might optionally be

        <li>When you require the IP address of the user agent, which

        might be connected directly to the server, or might optionally be

        separated from the server by a transparent load balancer or

        proxy, use request_rec->client_ip and

        request_rec->client_addr.</li>

        proxy, use request_rec->useragent_ip and

        request_rec->useragent_addr.</li>

        <li>When you require the IP address of the peer that is

        connected directly to the server, which might be the client or

        might be the load balancer or proxy itself, use

include/httpd.h

+2 −2
Changes for include/httpd.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1008,8 +1008,8 @@ struct request_rec { 
    /** remote address information from conn_rec, can be overridden if

     * necessary by a module.

     */

    apr_sockaddr_t *client_addr;

    char *client_ip;

    apr_sockaddr_t *useragent_addr;

    char *useragent_ip;

};



/**

modules/aaa/mod_access_compat.c

+1 −1
Changes for modules/aaa/mod_access_compat.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static int find_allowdeny(request_rec *r, apr_array_header_t *a, int method) 
            return 1;



        case T_IP:

            if (apr_ipsubnet_test(ap[i].x.ip, r->client_addr)) {

            if (apr_ipsubnet_test(ap[i].x.ip, r->useragent_addr)) {

                return 1;

            }

            break;

modules/aaa/mod_authz_host.c

+4 −4
Changes for modules/aaa/mod_authz_host.c: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static authz_status ip_check_authorization(request_rec *r, 
    apr_ipsubnet_t **ip = (apr_ipsubnet_t **)parsed_require_line;



    while (*ip) {

        if (apr_ipsubnet_test(*ip, r->client_addr))

        if (apr_ipsubnet_test(*ip, r->useragent_addr))

            return AUTHZ_GRANTED;

        ip++;

    }
@@ -201,10 +201,10 @@ static authz_status local_check_authorization(request_rec *r, 
                                              const void *parsed_require_line)

{

     if (   apr_sockaddr_equal(r->connection->local_addr,

                               r->client_addr)

         || apr_ipsubnet_test(localhost_v4, r->client_addr)

                               r->useragent_addr)

         || apr_ipsubnet_test(localhost_v4, r->useragent_addr)

#if APR_HAVE_IPV6

         || apr_ipsubnet_test(localhost_v6, r->client_addr)

         || apr_ipsubnet_test(localhost_v6, r->useragent_addr)

#endif

        )

     {

modules/arch/netware/mod_nw_ssl.c

+1 −1
Changes for modules/arch/netware/mod_nw_ssl.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, 
            else if (strcEQ(var, "REQUEST_FILENAME"))

                result = r->filename;

            else if (strcEQ(var, "REMOTE_ADDR"))

                result = r->client_ip;

                result = r->useragent_ip;

            else if (strcEQ(var, "REMOTE_HOST"))

                result = ap_get_remote_host(r->connection, r->per_dir_config,

                                            REMOTE_NAME, NULL);