<!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" />
<title>[24918] branches/3.6: Use wp_safe_remote_request() and friends instead of reject_unsafe_urls = true.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24918">24918</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-07-31 06:53:06 +0000 (Wed, 31 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use wp_safe_remote_request() and friends instead of reject_unsafe_urls = true.
Merges <a href="http://core.trac.wordpress.org/changeset/24917">[24917]</a> to the 3.6 branch.
fixes <a href="http://core.trac.wordpress.org/ticket/24646">#24646</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches36wpadminincludesclasswpimporterphp">branches/3.6/wp-admin/includes/class-wp-importer.php</a></li>
<li><a href="#branches36wpadminincludesfilephp">branches/3.6/wp-admin/includes/file.php</a></li>
<li><a href="#branches36wpincludesclassfeedphp">branches/3.6/wp-includes/class-feed.php</a></li>
<li><a href="#branches36wpincludesclassoembedphp">branches/3.6/wp-includes/class-oembed.php</a></li>
<li><a href="#branches36wpincludesclasswpxmlrpcserverphp">branches/3.6/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#branches36wpincludescommentphp">branches/3.6/wp-includes/comment.php</a></li>
<li><a href="#branches36wpincludesfunctionsphp">branches/3.6/wp-includes/functions.php</a></li>
<li><a href="#branches36wpincludesrssphp">branches/3.6/wp-includes/rss.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches36">branches/3.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.6
</span><span class="cx">===================================================================
</span><del>--- branches/3.6 2013-07-31 06:52:13 UTC (rev 24917)
</del><ins>+++ branches/3.6 2013-07-31 06:53:06 UTC (rev 24918)
</ins><a id="branches36"></a>
<div class="propset"><h4>Property changes: branches/3.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,24855,24861,24866,24868,24872,24875,24883-24886,24892,24894-24895,24902,24913,24915
</del><ins>+/trunk:18512,24855,24861,24866,24868,24872,24875,24883-24886,24892,24894-24895,24902,24913,24915,24917
</ins><span class="cx">\ No newline at end of property
</span><a id="branches36wpadminincludesclasswpimporterphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-admin/includes/class-wp-importer.php (24917 => 24918)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-admin/includes/class-wp-importer.php 2013-07-31 06:52:13 UTC (rev 24917)
+++ branches/3.6/wp-admin/includes/class-wp-importer.php 2013-07-31 06:53:06 UTC (rev 24918)
</span><span class="lines">@@ -183,7 +183,6 @@
</span><span class="cx">
</span><span class="cx"> $headers = array();
</span><span class="cx"> $args = array();
</span><del>- $args['reject_unsafe_urls'] = true;
</del><span class="cx"> if ( true === $head )
</span><span class="cx"> $args['method'] = 'HEAD';
</span><span class="cx"> if ( !empty( $username ) && !empty( $password ) )
</span><span class="lines">@@ -191,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> $args['headers'] = $headers;
</span><span class="cx">
</span><del>- return wp_remote_request( $url, $args );
</del><ins>+ return wp_safe_remote_request( $url, $args );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="branches36wpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-admin/includes/file.php (24917 => 24918)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-admin/includes/file.php 2013-07-31 06:52:13 UTC (rev 24917)
+++ branches/3.6/wp-admin/includes/file.php 2013-07-31 06:53:06 UTC (rev 24918)
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> if ( ! $tmpfname )
</span><span class="cx"> return new WP_Error('http_no_file', __('Could not create Temporary file.'));
</span><span class="cx">
</span><del>- $response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname, 'reject_unsafe_urls' => true ) );
</del><ins>+ $response = wp_safe_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) ) {
</span><span class="cx"> unlink( $tmpfname );
</span></span></pre></div>
<a id="branches36wpincludesclassfeedphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/class-feed.php (24917 => 24918)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/class-feed.php 2013-07-31 06:52:13 UTC (rev 24917)
+++ branches/3.6/wp-includes/class-feed.php 2013-07-31 06:53:06 UTC (rev 24918)
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx"> $args = array(
</span><span class="cx"> 'timeout' => $this->timeout,
</span><span class="cx"> 'redirection' => $this->redirects,
</span><del>- 'reject_unsafe_urls' => true,
</del><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( !empty($this->headers) )
</span><span class="lines">@@ -78,7 +77,7 @@
</span><span class="cx"> if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
</span><span class="cx"> $args['user-agent'] = $this->useragent;
</span><span class="cx">
</span><del>- $res = wp_remote_request($url, $args);
</del><ins>+ $res = wp_safe_remote_request($url, $args);
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error($res) ) {
</span><span class="cx"> $this->error = 'WP HTTP Error: ' . $res->get_error_message();
</span></span></pre></div>
<a id="branches36wpincludesclassoembedphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/class-oembed.php (24917 => 24918)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/class-oembed.php 2013-07-31 06:52:13 UTC (rev 24917)
+++ branches/3.6/wp-includes/class-oembed.php 2013-07-31 06:53:06 UTC (rev 24918)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> $providers = array();
</span><span class="cx">
</span><span class="cx"> // Fetch URL content
</span><del>- if ( $html = wp_remote_retrieve_body( wp_remote_get( $url, array( 'reject_unsafe_urls' => true ) ) ) ) {
</del><ins>+ if ( $html = wp_remote_retrieve_body( wp_safe_remote_get( $url ) ) ) {
</ins><span class="cx">
</span><span class="cx"> // <link> types that contain oEmbed provider URLs
</span><span class="cx"> $linktypes = apply_filters( 'oembed_linktypes', array(
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> */
</span><span class="cx"> function _fetch_with_format( $provider_url_with_args, $format ) {
</span><span class="cx"> $provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args );
</span><del>- $response = wp_remote_get( $provider_url_with_args, array( 'reject_unsafe_urls' => true ) );
</del><ins>+ $response = wp_safe_remote_get( $provider_url_with_args );
</ins><span class="cx"> if ( 501 == wp_remote_retrieve_response_code( $response ) )
</span><span class="cx"> return new WP_Error( 'not-implemented' );
</span><span class="cx"> if ( ! $body = wp_remote_retrieve_body( $response ) )
</span></span></pre></div>
<a id="branches36wpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/class-wp-xmlrpc-server.php (24917 => 24918)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/class-wp-xmlrpc-server.php 2013-07-31 06:52:13 UTC (rev 24917)
+++ branches/3.6/wp-includes/class-wp-xmlrpc-server.php 2013-07-31 06:53:06 UTC (rev 24918)
</span><span class="lines">@@ -5392,10 +5392,9 @@
</span><span class="cx"> $http_api_args = array(
</span><span class="cx"> 'timeout' => 10,
</span><span class="cx"> 'redirection' => 0,
</span><del>- 'reject_unsafe_urls' => true,
</del><span class="cx"> 'limit_response_size' => 153600, // 150 KB
</span><span class="cx"> );
</span><del>- $linea = wp_remote_retrieve_body( wp_remote_get( $pagelinkedfrom, $http_api_args ) );
</del><ins>+ $linea = wp_remote_retrieve_body( wp_safe_remote_get( $pagelinkedfrom, $http_api_args ) );
</ins><span class="cx">
</span><span class="cx"> if ( !$linea )
</span><span class="cx"> return $this->pingback_error( 16, __( 'The source URL does not exist.' ) );
</span></span></pre></div>
<a id="branches36wpincludescommentphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/comment.php (24917 => 24918)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/comment.php 2013-07-31 06:52:13 UTC (rev 24917)
+++ branches/3.6/wp-includes/comment.php 2013-07-31 06:53:06 UTC (rev 24918)
</span><span class="lines">@@ -1658,7 +1658,7 @@
</span><span class="cx"> if ( 0 === strpos($url, $uploads_dir['baseurl']) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $response = wp_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0', 'reject_unsafe_urls' => true ) );
</del><ins>+ $response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -1671,7 +1671,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
</span><del>- $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0', 'reject_unsafe_urls' => true ) );
</del><ins>+ $response = wp_safe_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -1906,7 +1906,6 @@
</span><span class="cx">
</span><span class="cx"> $options = array();
</span><span class="cx"> $options['timeout'] = 4;
</span><del>- $options['reject_unsafe_urls'] = true;
</del><span class="cx"> $options['body'] = array(
</span><span class="cx"> 'title' => $title,
</span><span class="cx"> 'url' => get_permalink($ID),
</span><span class="lines">@@ -1914,7 +1913,7 @@
</span><span class="cx"> 'excerpt' => $excerpt
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $response = wp_remote_post($trackback_url, $options);
</del><ins>+ $response = wp_safe_remote_post( $trackback_url, $options );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branches36wpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/functions.php (24917 => 24918)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/functions.php 2013-07-31 06:52:13 UTC (rev 24917)
+++ branches/3.6/wp-includes/functions.php 2013-07-31 06:53:06 UTC (rev 24918)
</span><span class="lines">@@ -496,14 +496,13 @@
</span><span class="cx">
</span><span class="cx"> $options = array();
</span><span class="cx"> $options['redirection'] = 5;
</span><del>- $options['reject_unsafe_urls'] = true;
</del><span class="cx">
</span><span class="cx"> if ( false == $file_path )
</span><span class="cx"> $options['method'] = 'HEAD';
</span><span class="cx"> else
</span><span class="cx"> $options['method'] = 'GET';
</span><span class="cx">
</span><del>- $response = wp_remote_request($url, $options);
</del><ins>+ $response = wp_safe_remote_request( $url, $options );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -544,7 +543,7 @@
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><span class="cx"> _deprecated_argument( __FUNCTION__, '2.7' );
</span><span class="cx">
</span><del>- $response = wp_remote_head( $url, array( 'reject_unsafe_urls' => true ) );
</del><ins>+ $response = wp_safe_remote_head( $url );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -759,9 +758,8 @@
</span><span class="cx">
</span><span class="cx"> $options = array();
</span><span class="cx"> $options['timeout'] = 10;
</span><del>- $options['reject_unsafe_urls'] = true;
</del><span class="cx">
</span><del>- $response = wp_remote_get( $uri, $options );
</del><ins>+ $response = wp_safe_remote_get( $uri, $options );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branches36wpincludesrssphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/rss.php (24917 => 24918)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/rss.php 2013-07-31 06:52:13 UTC (rev 24917)
+++ branches/3.6/wp-includes/rss.php 2013-07-31 06:53:06 UTC (rev 24918)
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx"> * @return Snoopy style response
</span><span class="cx"> */
</span><span class="cx"> function _fetch_remote_file($url, $headers = "" ) {
</span><del>- $resp = wp_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT, 'reject_unsafe_urls' => true ));
</del><ins>+ $resp = wp_safe_remote_request( $url, array( 'headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT ) );
</ins><span class="cx"> if ( is_wp_error($resp) ) {
</span><span class="cx"> $error = array_shift($resp->errors);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>