<!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>[57876] trunk/src/wp-includes/Requests/src: External Libraries: Update the Requests library to version 2.0.11.</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 { white-space: pre-line; 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/57876">57876</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/57876","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-03-25 12:21:36 +0000 (Mon, 25 Mar 2024)</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'>External Libraries: Update the Requests library to version 2.0.11.
This is a maintenance release with two minor fixes to improve PHP 8.4 compatibility.
References:
- [https://github.com/WordPress/Requests/releases/tag/v2.0.11 Requests 2.0.11 release notes]
- [https://github.com/WordPress/Requests/compare/v2.0.9...v2.0.11 Full list of changes in Requests 2.0.11]
Follow-up to <a href="https://core.trac.wordpress.org/changeset/56554">[56554]</a>, <a href="https://core.trac.wordpress.org/changeset/54997">[54997]</a>, <a href="https://core.trac.wordpress.org/changeset/55007">[55007]</a>, <a href="https://core.trac.wordpress.org/changeset/55046">[55046]</a>, <a href="https://core.trac.wordpress.org/changeset/55225">[55225]</a>, <a href="https://core.trac.wordpress.org/changeset/55296">[55296]</a>, <a href="https://core.trac.wordpress.org/changeset/55629">[55629]</a>.
Props swissspidy, jrf.
Fixes <a href="https://core.trac.wordpress.org/ticket/60838">#60838</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesRequestssrcCookiephp">trunk/src/wp-includes/Requests/src/Cookie.php</a></li>
<li><a href="#trunksrcwpincludesRequestssrcRequestsphp">trunk/src/wp-includes/Requests/src/Requests.php</a></li>
<li><a href="#trunksrcwpincludesRequestssrcTransportFsockopenphp">trunk/src/wp-includes/Requests/src/Transport/Fsockopen.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesRequestssrcCookiephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/Requests/src/Cookie.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/Requests/src/Cookie.php 2024-03-25 11:06:37 UTC (rev 57875)
+++ trunk/src/wp-includes/Requests/src/Cookie.php 2024-03-25 12:21:36 UTC (rev 57876)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,13 +470,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param \WpOrg\Requests\Iri|null $origin URI for comparing cookie origins
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|null $time Reference time for expiration calculation
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $origin argument is not null or an instance of the Iri class.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function parse_from_headers(Headers $headers, Iri $origin = null, $time = null) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function parse_from_headers(Headers $headers, $origin = null, $time = null) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cookie_headers = $headers->getValues('Set-Cookie');
</span><span class="cx" style="display: block; padding: 0 10px"> if (empty($cookie_headers)) {
</span><span class="cx" style="display: block; padding: 0 10px"> return [];
</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">+ if ($origin !== null && !($origin instanceof Iri)) {
+ throw InvalidArgument::create(2, '$origin', Iri::class . ' or null', gettype($origin));
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $cookies = [];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($cookie_headers as $header) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = self::parse($header, '', $time);
</span></span></pre></div>
<a id="trunksrcwpincludesRequestssrcRequestsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/Requests/src/Requests.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/Requests/src/Requests.php 2024-03-25 11:06:37 UTC (rev 57875)
+++ trunk/src/wp-includes/Requests/src/Requests.php 2024-03-25 12:21:36 UTC (rev 57876)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const VERSION = '2.0.9';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const VERSION = '2.0.11';
</ins><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"> * Selected transport name
</span></span></pre></div>
<a id="trunksrcwpincludesRequestssrcTransportFsockopenphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/Requests/src/Transport/Fsockopen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/Requests/src/Transport/Fsockopen.php 2024-03-25 11:06:37 UTC (rev 57875)
+++ trunk/src/wp-includes/Requests/src/Transport/Fsockopen.php 2024-03-25 12:21:36 UTC (rev 57876)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,15 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- stream_context_set_option($context, ['ssl' => $context_options]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle the PHP 8.4 deprecation (PHP 9.0 removal) of the function signature we use for stream_context_set_option().
+ // Ref: https://wiki.php.net/rfc/deprecate_functions_with_overloaded_signatures#stream_context_set_option
+ if (function_exists('stream_context_set_options')) {
+ // PHP 8.3+.
+ stream_context_set_options($context, ['ssl' => $context_options]);
+ } else {
+ // PHP < 8.3.
+ stream_context_set_option($context, ['ssl' => $context_options]);
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $remote_socket = 'tcp://' . $host;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>