From 9ce892cf4395e73b136e9b5cd1fae9e91995c93b Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 29 Nov 2012 12:31:26 +0100
Subject: [PATCH] [HttpFoundation] reverted variable rename

---
 src/Symfony/Component/HttpFoundation/Request.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index f655c0e129..c49b2077c3 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -25,7 +25,7 @@ class Request
     const HEADER_CLIENT_PROTO = 'client_proto';
     const HEADER_CLIENT_PORT = 'client_port';
 
-    protected static $trustProxyData = false;
+    protected static $trustProxy = false;
 
     protected static $trustedProxies = array();
 
@@ -382,7 +382,7 @@ class Request
      */
     public static function trustProxyData()
     {
-        self::$trustProxyData = true;
+        self::$trustProxy = true;
     }
 
     /**
@@ -397,7 +397,7 @@ class Request
     public static function setTrustedProxies(array $proxies)
     {
         self::$trustedProxies = $proxies;
-        self::$trustProxyData = $proxies ? true : false;
+        self::$trustProxy = $proxies ? true : false;
     }
 
     /**
@@ -522,7 +522,7 @@ class Request
     {
         $ip = $this->server->get('REMOTE_ADDR');
 
-        if (!$proxy && !self::$trustProxyData) {
+        if (!$proxy && !self::$trustProxy) {
             return $ip;
         }
 
@@ -533,7 +533,7 @@ class Request
         $clientIps = array_map('trim', explode(',', $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_IP])));
         $clientIps[] = $ip;
 
-        $trustedProxies = ($proxy || self::$trustProxyData) && !self::$trustedProxies ? array($ip) : self::$trustedProxies;
+        $trustedProxies = ($proxy || self::$trustProxy) && !self::$trustedProxies ? array($ip) : self::$trustedProxies;
         $clientIps = array_diff($clientIps, $trustedProxies);
 
         return array_pop($clientIps);
@@ -647,7 +647,7 @@ class Request
      */
     public function getPort()
     {
-        if (self::$trustProxyData && self::$trustedHeaders[self::HEADER_CLIENT_PORT] && $port = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PORT])) {
+        if (self::$trustProxy && self::$trustedHeaders[self::HEADER_CLIENT_PORT] && $port = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PORT])) {
             return $port;
         }
 
@@ -776,7 +776,7 @@ class Request
      */
     public function isSecure()
     {
-        if (self::$trustProxyData && self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && $proto = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO])) {
+        if (self::$trustProxy && self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && $proto = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO])) {
             return in_array(strtolower($proto), array('https', 'on', '1'));
         }
 
@@ -800,7 +800,7 @@ class Request
      */
     public function getHost()
     {
-        if (self::$trustProxyData && self::$trustedHeaders[self::HEADER_CLIENT_HOST] && $host = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_HOST])) {
+        if (self::$trustProxy && self::$trustedHeaders[self::HEADER_CLIENT_HOST] && $host = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_HOST])) {
             $elements = explode(',', $host);
 
             $host = trim($elements[count($elements) - 1]);