From 604d1e47b736c58006d4d9af9187931aecdbcb79 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Tue, 15 Mar 2011 12:00:53 +0000 Subject: [PATCH] After r83879, we're requiring php 5.2.3 Remove < 5.1.7 check and related code --- includes/HttpFunctions.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 4a56f89747..ecf22773ef 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -694,10 +694,6 @@ class PhpHttpRequest extends MWHttpRequest { $this->postData = wfArrayToCGI( $this->postData ); } - // At least on Centos 4.8 with PHP 5.1.6, using max_redirects to follow redirects - // causes a segfault - $manuallyRedirect = version_compare( phpversion(), '5.1.7', '<' ); - if ( $this->parsedUrl['scheme'] != 'http' ) { $this->status->fatal( 'http-invalid-scheme', $this->parsedUrl['scheme'] ); } @@ -715,7 +711,7 @@ class PhpHttpRequest extends MWHttpRequest { $options['request_fulluri'] = true; } - if ( !$this->followRedirects || $manuallyRedirect ) { + if ( !$this->followRedirects ) { $options['max_redirects'] = 0; } else { $options['max_redirects'] = $this->maxRedirects; @@ -765,7 +761,7 @@ class PhpHttpRequest extends MWHttpRequest { $this->headerList = $result['wrapper_data']; $this->parseHeader(); - if ( !$manuallyRedirect || !$this->followRedirects ) { + if ( !$this->followRedirects ) { break; } -- 2.20.1