Changeset 17535

Timestamp:

03/23/2011 11:58:09 AM (14 years ago)

Author:

dd32

Message:

Prune PHP5 compat checks in WP_Http, WP_Http_Curl & WP_Http_Streams. Only removes pre PHP 5.2.4 conditional code. See #13915

File:

• trunk/wp-includes/class-http.php (modified) (3 diffs)

trunk/wp-includes/class-http.php

@@ -289 +289 @@
         } else {
             if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
-                if ( ! version_compare(phpversion(), '5.1.2', '>=') )
-                    $r['body'] = _http_build_query( $r['body'], null, '&' );
-                else
-                    $r['body'] = http_build_query( $r['body'], null, '&' );
+                $r['body'] = http_build_query( $r['body'], null, '&' );
                 $r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
                 $r['headers']['Content-Length'] = strlen( $r['body'] );
@@ -955 +952 @@
             return false;
 
-        if ( version_compare(PHP_VERSION, '5.0', '<') )
-            return false;
-
-        //HTTPS via Proxy was added in 5.1.0
-        $is_ssl = isset($args['ssl']) && $args['ssl'];
-        if ( $is_ssl && version_compare(PHP_VERSION, '5.1.0', '<') ) {
-            $proxy = new WP_HTTP_Proxy();
-            /**
-             * No URL check, as its not currently passed to the ::test() function
-             * In the case where a Proxy is in use, Just bypass this transport for HTTPS.
-             */
-            if ( $proxy->is_enabled() )
-                return false;
-        }
-
         return apply_filters('use_streams_transport', true, $args);
     }
@@ -1176 +1158 @@
         if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
 
-            $isPHP5 = version_compare(PHP_VERSION, '5.0.0', '>=');
-
-            if ( $isPHP5 ) {
-                curl_setopt( $handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP );
-                curl_setopt( $handle, CURLOPT_PROXY, $proxy->host() );
-                curl_setopt( $handle, CURLOPT_PROXYPORT, $proxy->port() );
-            } else {
-                curl_setopt( $handle, CURLOPT_PROXY, $proxy->host() .':'. $proxy->port() );
-            }
+            curl_setopt( $handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP );
+            curl_setopt( $handle, CURLOPT_PROXY, $proxy->host() );
+            curl_setopt( $handle, CURLOPT_PROXYPORT, $proxy->port() );
 
             if ( $proxy->use_authentication() ) {
-                if ( $isPHP5 )
-                    curl_setopt( $handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY );
-
+                curl_setopt( $handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY );
                 curl_setopt( $handle, CURLOPT_PROXYUSERPWD, $proxy->authentication() );
             }