monitoring/eventReceivers/MonitoringAccessHandler.pm | 7 ++++++- web/modules/pxt/PXT/ApacheHandler.pm | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-)
New commits: commit 2e6bac11a125d3b348ede3f6dbdc6abc0a0df443 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Mar 21 15:36:11 2013 +0100
922250 - use $r->useragent_ip on Apache 2.4, $r->connection->remote_ip otherwise.
Based on http://httpd.apache.org/docs/2.4/developer/new_api_2_4.html
diff --git a/monitoring/eventReceivers/MonitoringAccessHandler.pm b/monitoring/eventReceivers/MonitoringAccessHandler.pm index 2f0f66b..ab44cee 100644 --- a/monitoring/eventReceivers/MonitoringAccessHandler.pm +++ b/monitoring/eventReceivers/MonitoringAccessHandler.pm @@ -45,7 +45,12 @@ sub handler {
# Check to ensure the remote request is from an allowed monitoring satellite # or proxy - my $remote_ip = $r->connection->remote_ip; + my $remote_ip; + if ($r->can('useragent_ip')) { + $remote_ip = $r->useragent_ip; + } else { + $remote_ip = $r->connection->remote_ip; + } my ($valid_ip) = grep { $_ eq $remote_ip } @valid_ips;
unless ($valid_ip) { diff --git a/web/modules/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm index fb7345e..25ee3a7 100644 --- a/web/modules/pxt/PXT/ApacheHandler.pm +++ b/web/modules/pxt/PXT/ApacheHandler.pm @@ -368,7 +368,11 @@ sub initialize_pxt { } else { # create session, use some data as chaff to "seed" the randomness - $session = new RHN::Session $r->hostname, $r->connection->remote_ip; + if ($r->can('useragent_ip')) { + $session = new RHN::Session $r->hostname, $r->useragent_ip; + } else { + $session = new RHN::Session $r->hostname, $r->connection->remote_ip; + } } }; if ($@ and catchable($@)) {
spacewalk-commits@lists.fedorahosted.org