Merge branch 'master' of gitorious.org:statusnet/mainline

2012-01-21 21:12:53 -05:00
parent b475c871a4 98acec74f5
commit 259a262df4
2 changed files with 2 additions and 0 deletions
--- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php
+++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
@@ -223,6 +223,7 @@ class RegisterThrottlePlugin extends Plugin
    private function _getIpAddress()
    {
        $keys = array('HTTP_X_FORWARDED_FOR',
+                      'HTTP_X_CLIENT',
                      'CLIENT-IP',
                      'REMOTE_ADDR');