You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/09/26 12:56:39 UTC
svn commit: r1627744 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
server/scoreboard.c
Author: jim
Date: Fri Sep 26 10:56:39 2014
New Revision: 1627744
URL: http://svn.apache.org/r1627744
Log:
Merge r1624349 from trunk:
mod_status should honor remote_ip as documented
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/scoreboard.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1624349
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1627744&r1=1627743&r2=1627744&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Sep 26 10:56:39 2014
@@ -2,6 +2,9 @@
Changes with Apache 2.4.11
+ *) mod_status: Honor client IP address using mod_remoteip. PR 55886.
+ [Jim Jagielski]
+
*) cmake-based build for Windows: Fix incompatibility with cmake 2.8.12
and later. PR 56615. [Chuck Liu <cliu81 gmail.com>, Jeff Trawick]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1627744&r1=1627743&r2=1627744&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Sep 26 10:56:39 2014
@@ -102,12 +102,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_status: honor mod_remoteip.
- trunk patch: http://svn.apache.org/r1624349
- 2.4.x patch: trunk patch works
- +1: jim, jkaluza, mrumph
- mrumph: This fix should be credited to bug 55886.
-
* mod_cache: Avoid sending a 304 to an unconditional request during a
revalidation. PR56881
trunk patch: http://svn.apache.org/r1619835
Modified: httpd/httpd/branches/2.4.x/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/scoreboard.c?rev=1627744&r1=1627743&r2=1627744&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/scoreboard.c (original)
+++ httpd/httpd/branches/2.4.x/server/scoreboard.c Fri Sep 26 10:56:39 2014
@@ -484,8 +484,14 @@ static int update_child_status_internal(
ws->conn_bytes = 0;
}
if (r) {
- apr_cpystrn(ws->client, ap_get_remote_host(c, r->per_dir_config,
- REMOTE_NOLOOKUP, NULL), sizeof(ws->client));
+ const char *client = ap_get_remote_host(c, r->per_dir_config,
+ REMOTE_NOLOOKUP, NULL);
+ if (!client || !strcmp(client, c->client_ip)) {
+ apr_cpystrn(ws->client, r->useragent_ip, sizeof(ws->client));
+ }
+ else {
+ apr_cpystrn(ws->client, client, sizeof(ws->client));
+ }
copy_request(ws->request, sizeof(ws->request), r);
if (r->server) {
apr_snprintf(ws->vhost, sizeof(ws->vhost), "%s:%d",