Index: trunk/phase3/includes/WebRequest.php |
— | — | @@ -43,8 +43,7 @@ |
44 | 44 | * @ingroup HTTP |
45 | 45 | */ |
46 | 46 | class WebRequest { |
47 | | - protected $data = array(); |
48 | | - var $headers; |
| 47 | + protected $data, $headers = array(); |
49 | 48 | private $_response, $mFixMagicQuotes; |
50 | 49 | |
51 | 50 | public function __construct() { |
— | — | @@ -632,8 +631,7 @@ |
633 | 632 | public function getHeader( $name ) { |
634 | 633 | $name = strtoupper( $name ); |
635 | 634 | if ( function_exists( 'apache_request_headers' ) ) { |
636 | | - if ( !isset( $this->headers ) ) { |
637 | | - $this->headers = array(); |
| 635 | + if ( !$this->headers ) { |
638 | 636 | foreach ( apache_request_headers() as $tempName => $tempValue ) { |
639 | 637 | $this->headers[ strtoupper( $tempName ) ] = $tempValue; |
640 | 638 | } |
— | — | @@ -681,7 +679,7 @@ |
682 | 680 | */ |
683 | 681 | class FauxRequest extends WebRequest { |
684 | 682 | private $wasPosted = false; |
685 | | - private $session, $headers = array(); |
| 683 | + private $session = array(); |
686 | 684 | |
687 | 685 | /** |
688 | 686 | * @param $data Array of *non*-urlencoded key => value pairs, the |