William A. Rowe Jr 0ebed1b38e 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 {



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

2016-02-12 01:19:49 +00:00

..

mpm

event: slave connection init, vhost early config

2016-01-29 15:51:25 +00:00

.indent.pro

Apache 1.3.9 baseline for the Apache 2.0 repository.

1999-08-24 06:46:03 +00:00

apreq_cookie.c

Fix warning: 'nlen' may be used uninitialized in this function.

2011-12-19 16:10:22 +00:00

apreq_error.c

As discussed at AC NA 2011

2011-11-13 00:20:32 +00:00

apreq_module_cgi.c

Style ('{' on same line as function definition)

2014-10-11 05:47:02 +00:00

apreq_module_custom.c

As discussed at AC NA 2011

2011-11-13 00:20:32 +00:00

apreq_module.c

As discussed at AC NA 2011

2011-11-13 00:20:32 +00:00

apreq_param.c

As discussed at AC NA 2011

2011-11-13 00:20:32 +00:00

apreq_parser_header.c

value never used: dead assignment

2011-11-21 15:51:48 +00:00

apreq_parser_multipart.c

As discussed at AC NA 2011

2011-11-13 00:20:32 +00:00

apreq_parser_urlencoded.c

As discussed at AC NA 2011

2011-11-13 00:20:32 +00:00

apreq_parser.c

Silence a sparse warning about inconsistent indenting + some minor style issues

2015-08-31 20:41:18 +00:00

apreq_util.c

tab vs space

2014-10-22 05:12:51 +00:00

buildmark.c

update license header text

2006-07-11 20:33:53 +00:00

config.c

Follow up to r1715876: core directives' tokens are ASCII.

2015-12-30 00:22:44 +00:00

config.m4

Add server directory to INCLUDES.

2011-01-17 10:45:54 +00:00

connection.c

fix for wrong return check on ap_prep_lingering_close(), causing regressions

2016-01-29 13:13:05 +00:00

core_filters.c

Remain compatible with legacy MPMs that passed NULL to the network filter

2015-10-04 10:41:27 +00:00

core.c

Introduce an ap_get_useragent_host() accessor to replace the old

2016-02-12 01:04:58 +00:00

eoc_bucket.c

update license header text

2006-07-11 20:33:53 +00:00

eor_bucket.c

eor_bucket: follow up to r1707159.

2015-10-07 19:17:34 +00:00

error_bucket.c

core, modules: like r1657897 but for core and other modules than mod_proxy.

2015-03-10 17:25:17 +00:00

gen_test_char.c

Fixed position of the NEED_ENHANCED_ESCAPES define.

2012-04-25 10:36:37 +00:00

gen_test_char.dsp

Remove all /machine:I386 references, these are getting in the way

2006-04-27 05:30:39 +00:00

listen.c

core: Follow up to r1599601: s/ap_log_common/ap_log_mpm_common/.

2015-05-16 09:17:29 +00:00

log.c

Follow up to r1715880: revert abusive ap_casecmpstr[n]() usages.

2015-11-24 14:38:54 +00:00

main.c

core: follow up to r1629925: new log tag

2014-10-07 16:59:44 +00:00

Makefile.in

skiplist is now in apr 1.5 and above

2013-10-02 12:12:36 +00:00

mpm_common.c

Remove some useless 'return' statements.

2015-11-21 22:20:54 +00:00

mpm_unix.c

Use new ap_casecmpstr[n]() functions where appropriate (not exhaustive).

2015-11-23 16:46:01 +00:00

NWGNUmakefile

NetWare build tweaks.

2012-08-09 12:11:09 +00:00

protocol.c

Remove now useless apr_pstrdup.

2016-02-05 22:24:38 +00:00

provider.c

s/;;/;/

2012-10-12 16:41:34 +00:00

request.c

Added some more log numbers to log statements that

2016-01-19 15:43:17 +00:00

scoreboard.c

A rather ugly patch since the code was refactored recently to exclude

2016-02-12 01:19:49 +00:00

util_cfgtree.c

Remove all references to CORE_PRIVATE.

2008-04-07 10:45:43 +00:00

util_charset.c

Move comment from .c to .h in order to make use of it in doxygen.

2014-07-19 13:36:52 +00:00

util_cookies.c

Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitly

2012-01-06 18:15:08 +00:00

util_debug.c

In maintainer mode, replace apr_palloc with a version that

2012-02-24 20:47:01 +00:00

util_ebcdic.c

Missing va_end spotted by cppcheck

2014-08-21 06:56:40 +00:00

util_expr_eval.c

hostname: Test and log useragent_host per-request across various modules,

2016-02-12 01:17:03 +00:00

util_expr_parse.c

util_expr: sync bison generated source files with according

2014-12-08 21:20:50 +00:00

util_expr_parse.h

Revert r1643900.

2014-12-08 20:06:24 +00:00

util_expr_parse.y

* ap_exr: Add replace(string, from, to) function.

2014-11-27 13:46:11 +00:00

util_expr_private.h

Improve error message by removing 'unexpected T_ERROR' in one case.

2011-10-10 20:41:26 +00:00

util_expr_scan.c

Added some more log numbers to log statements that

2016-01-19 15:43:17 +00:00

util_expr_scan.l

Added some more log numbers to log statements that

2016-01-19 15:43:17 +00:00

util_fcgi.c

Add missing APLOGNO.

2014-07-20 09:32:58 +00:00

util_filter.c

Fix a typo when building a TRACE8 message.

2016-01-19 09:55:25 +00:00

util_md5.c

add new ap_bin2hex() utility function

2012-12-16 11:49:14 +00:00

util_mutex.c

Mutex directive: finish support of DefaultRuntimeDir

2012-08-07 14:49:44 +00:00

util_pcre.c

Re-introduce check for sufficient PCRE version.

2014-07-23 21:15:06 +00:00

util_regex.c

Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.

2015-12-10 06:52:10 +00:00

util_script.c

hostname: Test and log useragent_host per-request across various modules,

2016-02-12 01:17:03 +00:00

util_time.c

Typo

2014-06-07 04:57:44 +00:00

util_xml.c

core, modules: like r1657897 but for core and other modules than mod_proxy.

2015-03-10 17:25:17 +00:00

util.c

New support function: ap_getword_conf2[_nc] which acts

2015-12-30 12:03:01 +00:00

vhost.c

Added many log numbers to log statements that

2016-01-19 12:02:41 +00:00