<!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>[42229] branches/4.9: WPDB: Fix the parsing of sockets which contain colons within the socket name (used on some cloud providers).</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/42229">42229</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/42229","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>2017-11-27 00:55:11 +0000 (Mon, 27 Nov 2017)</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'>WPDB: Fix the parsing of sockets which contain colons within the socket name (used on some cloud providers).
Props natacado.
Merges <a href="https://core.trac.wordpress.org/changeset/42226">[42226]</a> to the 4.9 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/42634">#42634</a> for 4.9.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches49srcwpincludeswpdbphp">branches/4.9/src/wp-includes/wp-db.php</a></li>
<li><a href="#branches49testsphpunittestsdbphp">branches/4.9/tests/phpunit/tests/db.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches49">branches/4.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.9
</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.9 2017-11-26 23:56:25 UTC (rev 42228)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.9 2017-11-27 00:55:11 UTC (rev 42229)
</ins><a id="branches49"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.9</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,42132,42134,42136,42138,42140,42144,42146,42148,42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches49srcwpincludeswpdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/wp-db.php 2017-11-26 23:56:25 UTC (rev 42228)
+++ branches/4.9/src/wp-includes/wp-db.php 2017-11-27 00:55:11 UTC (rev 42229)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1643,14 +1643,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $socket = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $is_ipv6 = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // First peel off the socket parameter from the right, if it exists.
+ $socket_pos = strpos( $host, ':/' );
+ if ( $socket_pos !== false ) {
+ $socket = substr( $host, $socket_pos + 1 );
+ $host = substr( $host, 0, $socket_pos );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // We need to check for an IPv6 address first.
</span><span class="cx" style="display: block; padding: 0 10px"> // An IPv6 address will always contain at least two colons.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( substr_count( $host, ':' ) > 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern = '#^(?:\[)?(?<host>[0-9a-fA-F:]+)(?:\]:(?<port>[\d]+))?(?:/(?<socket>.+))?#';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern = '#^(?:\[)?(?<host>[0-9a-fA-F:]+)(?:\]:(?<port>[\d]+))?#';
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_ipv6 = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // We seem to be dealing with an IPv4 address.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern = '#^(?<host>[^:/]*)(?::(?<port>[\d]+))?(?::(?<socket>.+))?#';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern = '#^(?<host>[^:/]*)(?::(?<port>[\d]+))?#';
</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"> $matches = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1662,7 +1669,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"> $host = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( array( 'host', 'port', 'socket' ) as $component ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( array( 'host', 'port' ) as $component ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $matches[ $component ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $$component = $matches[ $component ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches49testsphpunittestsdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/tests/phpunit/tests/db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/tests/phpunit/tests/db.php 2017-11-26 23:56:25 UTC (rev 42228)
+++ branches/4.9/tests/phpunit/tests/db.php 2017-11-27 00:55:11 UTC (rev 42229)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1559,6 +1559,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':/tmp/mysql:with_colon.sock',
+ false,
+ '',
+ null,
+ '/tmp/mysql:with_colon.sock',
+ false,
+ ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> '127.0.0.1',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> '127.0.0.1',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1575,6 +1583,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '127.0.0.1:3306:/tmp/mysql:with_colon.sock',
+ false,
+ '127.0.0.1',
+ '3306',
+ '/tmp/mysql:with_colon.sock',
+ false,
+ ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'example.com',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1607,6 +1623,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'localhost:/tmp/mysql:with_colon.sock',
+ false,
+ 'localhost',
+ null,
+ '/tmp/mysql:with_colon.sock',
+ false,
+ ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> '0000:0000:0000:0000:0000:0000:0000:0001',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> '0000:0000:0000:0000:0000:0000:0000:0001',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1639,6 +1663,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '[::1]:3306:/tmp/mysql:with_colon.sock',
+ false,
+ '::1',
+ '3306',
+ '/tmp/mysql:with_colon.sock',
+ true,
+ ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> '2001:0db8:0000:0000:0000:ff00:0042:8329',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> '2001:0db8:0000:0000:0000:ff00:0042:8329',
</span></span></pre>
</div>
</div>
</body>
</html>