| Index: trunk/phase3/includes/HttpFunctions.php |
| — | — | @@ -694,10 +694,6 @@ |
| 695 | 695 | $this->postData = wfArrayToCGI( $this->postData ); |
| 696 | 696 | } |
| 697 | 697 | |
| 698 | | - // At least on Centos 4.8 with PHP 5.1.6, using max_redirects to follow redirects |
| 699 | | - // causes a segfault |
| 700 | | - $manuallyRedirect = version_compare( phpversion(), '5.1.7', '<' ); |
| 701 | | - |
| 702 | 698 | if ( $this->parsedUrl['scheme'] != 'http' ) { |
| 703 | 699 | $this->status->fatal( 'http-invalid-scheme', $this->parsedUrl['scheme'] ); |
| 704 | 700 | } |
| — | — | @@ -715,7 +711,7 @@ |
| 716 | 712 | $options['request_fulluri'] = true; |
| 717 | 713 | } |
| 718 | 714 | |
| 719 | | - if ( !$this->followRedirects || $manuallyRedirect ) { |
| | 715 | + if ( !$this->followRedirects ) { |
| 720 | 716 | $options['max_redirects'] = 0; |
| 721 | 717 | } else { |
| 722 | 718 | $options['max_redirects'] = $this->maxRedirects; |
| — | — | @@ -765,7 +761,7 @@ |
| 766 | 762 | $this->headerList = $result['wrapper_data']; |
| 767 | 763 | $this->parseHeader(); |
| 768 | 764 | |
| 769 | | - if ( !$manuallyRedirect || !$this->followRedirects ) { |
| | 765 | + if ( !$this->followRedirects ) { |
| 770 | 766 | break; |
| 771 | 767 | } |
| 772 | 768 | |