<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17535] trunk/wp-includes/class-http.php:
Prune PHP5 compat checks in WP_Http, WP_Http_Curl & WP_Http_Streams.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17535">17535</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-03-23 11:58:09 +0000 (Wed, 23 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prune PHP5 compat checks in WP_Http, WP_Http_Curl & WP_Http_Streams. Only removes pre PHP 5.2.4 conditional code. See <a href="http://trac.wordpress.org/ticket/13915">#13915</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (17534 => 17535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2011-03-23 11:35:41 UTC (rev 17534)
+++ trunk/wp-includes/class-http.php 2011-03-23 11:58:09 UTC (rev 17535)
</span><span class="lines">@@ -288,10 +288,7 @@
</span><span class="cx"> $transports = WP_Http::_getTransport( $r );
</span><span class="cx"> } else {
</span><span class="cx"> if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
</span><del>- if ( ! version_compare(phpversion(), '5.1.2', '>=') )
- $r['body'] = _http_build_query( $r['body'], null, '&' );
- else
- $r['body'] = http_build_query( $r['body'], null, '&' );
</del><ins>+ $r['body'] = http_build_query( $r['body'], null, '&' );
</ins><span class="cx"> $r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
</span><span class="cx"> $r['headers']['Content-Length'] = strlen( $r['body'] );
</span><span class="cx"> }
</span><span class="lines">@@ -954,21 +951,6 @@
</span><span class="cx"> if ( ! function_exists('fopen') || (function_exists('ini_get') && true != ini_get('allow_url_fopen')) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- 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;
- }
-
</del><span class="cx"> return apply_filters('use_streams_transport', true, $args);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1175,20 +1157,12 @@
</span><span class="cx">
</span><span class="cx"> if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
</span><span class="cx">
</span><del>- $isPHP5 = version_compare(PHP_VERSION, '5.0.0', '>=');
</del><ins>+ curl_setopt( $handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP );
+ curl_setopt( $handle, CURLOPT_PROXY, $proxy->host() );
+ curl_setopt( $handle, CURLOPT_PROXYPORT, $proxy->port() );
</ins><span class="cx">
</span><del>- 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() );
- }
-
</del><span class="cx"> if ( $proxy->use_authentication() ) {
</span><del>- if ( $isPHP5 )
- curl_setopt( $handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY );
-
</del><ins>+ curl_setopt( $handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY );
</ins><span class="cx"> curl_setopt( $handle, CURLOPT_PROXYUSERPWD, $proxy->authentication() );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>