• Jim Jagielski's avatar
    Merge r1729930, r1729931 from trunk: · f38b572e
    Jim Jagielski authored
    hostname: Test and log useragent_host per-request across various modules,
    including the scoreboard, expression and rewrite engines, setenvif,
    authz_host, access_compat, custom logging, ssl and REMOTE_HOST variables.
    PR55348  [William Rowe]
    
    This is the complete change set which applies cleanly to 2.4.x as well,
    the server/scoreboard.c will follow, which does not apply due to drift.
    
    
    
    A rather ugly patch since the code was refactored recently to exclude
    the simple patch for 2.4.x, illustrated below.
    
    Completes the changeset r1729930 and resolves all 2.4.19-dev corrections,
    but other 2.5.0-dev specific changes may still be needed on trunk.
    
    --- server/scoreboard.c	(revision 1729907)
    +++ server/scoreboard.c	(working copy)
    @@ -491,9 +491,8 @@
                 ws->conn_bytes = 0;
             }
             if (r) {
    -            const char *client = ap_get_remote_host(c, r->per_dir_config,
    -                                 REMOTE_NOLOOKUP, NULL);
    -            if (!client || !strcmp(client, c->client_ip)) {
    +            const char *client;
    +            if (!(client = ap_get_useragent_host(r, REMOTE_NOLOOKUP, NULL))) {
                     apr_cpystrn(ws->client, r->useragent_ip, sizeof(ws->client));
                 }
                 else {
    
    
    Submitted by: wrowe
    Reviewed/backported by: jim
    
    
    git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1733282 13f79535-47bb-0310-9956-ffa450edef68
    f38b572e
To find the state of this project's repository at the time of any of these versions, check out the tags.