<!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>[38728] branches/4.6: HTTP: Update Requests to master (0048f3c) which fixes a number of outstanding issues.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38728">38728</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38728","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-05 03:26:37 +0000 (Wed, 05 Oct 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>HTTP: Update Requests to master (0048f3c) which fixes a number of outstanding issues.
Merges <a href="https://core.trac.wordpress.org/changeset/38727">[38727]</a> to the 4.6 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/38070">#38070</a>, <a href="https://core.trac.wordpress.org/ticket/37733">#37733</a> by reverting part of <a href="https://core.trac.wordpress.org/changeset/38429">[38429]</a> and using the fix in Requests.
Fixes <a href="https://core.trac.wordpress.org/ticket/37992">#37992</a> allowing for connecting to SSL resources on ports other than 443.
Fixes <a href="https://core.trac.wordpress.org/ticket/37991">#37991</a> by not sending default ports in the `Host:` header.
Fixes <a href="https://core.trac.wordpress.org/ticket/37839">#37839</a> to match and decode Chunked responses correctly.
Fixes <a href="https://core.trac.wordpress.org/ticket/38232">#38232</a> allowing a SSL connection to ignore the hostname of the certificate when verification is disabled.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches46srcwpincludesRequestsIRIphp">branches/4.6/src/wp-includes/Requests/IRI.php</a></li>
<li><a href="#branches46srcwpincludesRequestsTransportcURLphp">branches/4.6/src/wp-includes/Requests/Transport/cURL.php</a></li>
<li><a href="#branches46srcwpincludesRequestsTransportfsockopenphp">branches/4.6/src/wp-includes/Requests/Transport/fsockopen.php</a></li>
<li><a href="#branches46srcwpincludesclasshttpphp">branches/4.6/src/wp-includes/class-http.php</a></li>
<li><a href="#branches46srcwpincludesclassrequestsphp">branches/4.6/src/wp-includes/class-requests.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches46">branches/4.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.6
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.6 2016-10-05 03:23:54 UTC (rev 38727)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.6 2016-10-05 03:26:37 UTC (rev 38728)
</ins><a id="branches46"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,38181,38183,38185-38186,38189,38191,38194,38196,38199,38201,38205,38207,38209,38211-38213,38215-38216,38218,38221,38225,38227,38234-38235,38242,38244,38248,38251,38255,38257,38261,38263,38267,38274,38276-38277,38281,38286,38349,38415,38426-38427,38429-38431,38433,38439,38441,38443,38447,38524,38580
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,38181,38183,38185-38186,38189,38191,38194,38196,38199,38201,38205,38207,38209,38211-38213,38215-38216,38218,38221,38225,38227,38234-38235,38242,38244,38248,38251,38255,38257,38261,38263,38267,38274,38276-38277,38281,38286,38349,38415,38426-38427,38429-38431,38433,38439,38441,38443,38447,38524,38580,38727
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches46srcwpincludesRequestsIRIphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-includes/Requests/IRI.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-includes/Requests/IRI.php 2016-10-05 03:23:54 UTC (rev 38727)
+++ branches/4.6/src/wp-includes/Requests/IRI.php 2016-10-05 03:26:37 UTC (rev 38728)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,10 +688,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
</span><span class="cx" style="display: block; padding: 0 10px"> if ($this->ipath !== '' &&
</span><span class="cx" style="display: block; padding: 0 10px"> (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $isauthority && (
- $this->ipath[0] !== '/' ||
- substr($this->ipath, 0, 2) === '//'
- ) ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $isauthority && $this->ipath[0] !== '/' ||
</ins><span class="cx" style="display: block; padding: 0 10px"> (
</span><span class="cx" style="display: block; padding: 0 10px"> $this->scheme === null &&
</span><span class="cx" style="display: block; padding: 0 10px"> !$isauthority &&
</span></span></pre></div>
<a id="branches46srcwpincludesRequestsTransportcURLphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-includes/Requests/Transport/cURL.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-includes/Requests/Transport/cURL.php 2016-10-05 03:23:54 UTC (rev 38727)
+++ branches/4.6/src/wp-includes/Requests/Transport/cURL.php 2016-10-05 03:26:37 UTC (rev 38728)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,8 +375,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> curl_setopt($this->handle, CURLOPT_URL, $url);
</span><span class="cx" style="display: block; padding: 0 10px"> curl_setopt($this->handle, CURLOPT_REFERER, $url);
</span><span class="cx" style="display: block; padding: 0 10px"> curl_setopt($this->handle, CURLOPT_USERAGENT, $options['useragent']);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- curl_setopt($this->handle, CURLOPT_HTTPHEADER, $headers);
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (!empty($headers)) {
+ curl_setopt($this->handle, CURLOPT_HTTPHEADER, $headers);
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> if ($options['protocol_version'] === 1.1) {
</span><span class="cx" style="display: block; padding: 0 10px"> curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $data Body data
</span><span class="cx" style="display: block; padding: 0 10px"> * @return integer Length of provided data
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function stream_body($handle, $data) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function stream_body($handle, $data) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->hooks->dispatch('request.progress', array($data, $this->response_bytes, $this->response_byte_limit));
</span><span class="cx" style="display: block; padding: 0 10px"> $data_length = strlen($data);
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches46srcwpincludesRequestsTransportfsockopenphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-includes/Requests/Transport/fsockopen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-includes/Requests/Transport/fsockopen.php 2016-10-05 03:23:54 UTC (rev 38727)
+++ branches/4.6/src/wp-includes/Requests/Transport/fsockopen.php 2016-10-05 03:26:37 UTC (rev 38728)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // HTTPS support
</span><span class="cx" style="display: block; padding: 0 10px"> if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https') {
</span><span class="cx" style="display: block; padding: 0 10px"> $remote_socket = 'ssl://' . $host;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url_parts['port'] = 443;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (!isset($url_parts['port'])) {
+ $url_parts['port'] = 443;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $context_options = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'verify_peer' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,6 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (isset($options['verifyname']) && $options['verifyname'] === false) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $context_options['verify_peer_name'] = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $verifyname = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if (!isset($case_insensitive_headers['Host'])) {
</span><span class="cx" style="display: block; padding: 0 10px"> $out .= sprintf('Host: %s', $url_parts['host']);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($url_parts['port'] !== 80) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (( 'http' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 80 ) || ( 'https' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 443 )) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out .= ':' . $url_parts['port'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $out .= "\r\n";
</span></span></pre></div>
<a id="branches46srcwpincludesclasshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-includes/class-http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-includes/class-http.php 2016-10-05 03:23:54 UTC (rev 38727)
+++ branches/4.6/src/wp-includes/class-http.php 2016-10-05 03:26:37 UTC (rev 38728)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,6 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // SSL certificate handling
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $r['sslverify'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $options['verify'] = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options['verifyname'] = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $options['verify'] = $r['sslcertificates'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,9 +363,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Work around a bug in Requests when the path starts with // See https://github.com/rmccue/Requests/issues/231
- $url = preg_replace( '!^(\w+://[^/]+)//(.*)$!i', '$1/$2', $url );
-
</del><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> $requests_response = Requests::request( $url, $headers, $data, $type, $options );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches46srcwpincludesclassrequestsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-includes/class-requests.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-includes/class-requests.php 2016-10-05 03:23:54 UTC (rev 38727)
+++ branches/4.6/src/wp-includes/class-requests.php 2016-10-05 03:26:37 UTC (rev 38728)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -749,15 +749,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Decoded body
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function decode_chunked($data) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($data))) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $decoded = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $encoded = $data;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while (true) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
</ins><span class="cx" style="display: block; padding: 0 10px"> if (!$is_chunked) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Looks like it's not chunked after all
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span></span></pre>
</div>
</div>
</body>
</html>