<!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>[34675] trunk: Revert r34674 due to failures on PHP < 5.4.</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/34675">34675</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/34675","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-29 01:00:17 +0000 (Tue, 29 Sep 2015)</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'>Revert <a href="https://core.trac.wordpress.org/changeset/34674">r34674</a> due to failures on PHP < 5.4.
See <a href="https://core.trac.wordpress.org/ticket/16859">#16859</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunktestsphpunittestsformattingEscUrlphp">trunk/tests/phpunit/tests/formatting/EscUrl.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></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/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2015-09-29 00:40:30 UTC (rev 34674)
+++ trunk/src/wp-includes/formatting.php 2015-09-29 01:00:17 UTC (rev 34675)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2077,17 +2077,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $dest = $matches[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $dest = 'http://' . $dest;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dest = esc_url($dest);
+ if ( empty($dest) )
+ return $matches[0];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // removed trailing [.,;:)] from URL
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = substr($dest, -1);
</span><span class="cx" style="display: block; padding: 0 10px"> $dest = substr($dest, 0, strlen($dest)-1);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $dest = esc_url($dest);
- if ( empty($dest) )
- return $matches[0];
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
</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">@@ -3280,8 +3278,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * (the default behaviour) ampersands are also replaced. The 'clean_url' filter
</span><span class="cx" style="display: block; padding: 0 10px"> * is applied to the returned cleaned URL.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * See RFC3986
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url The URL to be cleaned.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3297,7 +3293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $url;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( ' ', '%20', $url );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $url;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3310,7 +3306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace(';//', '://', $url);
</span><span class="cx" style="display: block; padding: 0 10px"> /* If the URL doesn't appear to contain a scheme, we
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * presume it needs http:// prepended (unless a relative
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * presume it needs http:// appended (unless a relative
</ins><span class="cx" style="display: block; padding: 0 10px"> * link starting with /, # or ? or a php file).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3324,43 +3320,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( "'", ''', $url );
</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">- if ( ( false !== strpos( $url, '[' ) ) || ( false !== strpos( $url, ']' ) ) ) {
-
- $parsed = parse_url( $url );
- $front = '';
-
- if ( isset( $parsed['scheme'] ) ) {
- $front .= $parsed['scheme'] . '://';
- } elseif ( '/' === $url[0] ) {
- $front .= '//';
- }
-
- if ( isset( $parsed['user'] ) ) {
- $front .= $parsed['user'];
- }
-
- if ( isset( $parsed['pass'] ) ) {
- $front .= ':' . $parsed['pass'];
- }
-
- if ( isset( $parsed['user'] ) || isset( $parsed['pass'] ) ) {
- $front .= '@';
- }
-
- if ( isset( $parsed['host'] ) ) {
- $front .= $parsed['host'];
- }
-
- if ( isset( $parsed['port'] ) ) {
- $front .= ':' . $parsed['port'];
- }
-
- $end_dirty = str_replace( $front, '', $url );
- $end_clean = str_replace( array( '[', ']' ), array( '%5B', '%5D' ), $end_dirty );
- $url = str_replace( $end_dirty, $end_clean, $url );
-
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( '/' === $url[0] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $good_protocol_url = $url;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingEscUrlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/EscUrl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/EscUrl.php 2015-09-29 00:40:30 UTC (rev 34674)
+++ trunk/tests/phpunit/tests/formatting/EscUrl.php 2015-09-29 01:00:17 UTC (rev 34675)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,41 +40,15 @@
</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"> function test_all_url_parts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = 'https://user:pass@host.example.com:1234/path;p=1?query=2&r[]=3#fragment';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = 'https://user:password@host.example.com:1234/path;p=1?q=2&r=3#fragment';
+ $this->assertEquals( $url, esc_url_raw( $url ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'scheme' => 'https',
- 'host' => 'host.example.com',
- 'port' => 1234,
- 'user' => 'user',
- 'pass' => 'pass',
- 'path' => '/path;p=1',
- 'query' => 'query=2&r[]=3',
- 'fragment' => 'fragment',
- ), parse_url( $url ) );
- $this->assertEquals( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url_raw( $url ) );
- $this->assertEquals( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url( $url ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'https://user:password@host.example.com:1234/path;p=1?q=2&r=3#fragment', esc_url( $url ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_all_url_parts_ipv6() {
- $url = 'https://user:pass@[::FFFF::127.0.0.1]:1234/path;p=1?query=2&r[]=3#fragment';
-
- $this->assertEquals( array(
- 'scheme' => 'https',
- 'host' => '[::FFFF::127.0.0.1]',
- 'port' => 1234,
- 'user' => 'user',
- 'pass' => 'pass',
- 'path' => '/path;p=1',
- 'query' => 'query=2&r[]=3',
- 'fragment' => 'fragment',
- ), parse_url( $url ) );
- $this->assertEquals( 'https://user:pass@[::FFFF::127.0.0.1]:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url_raw( $url ) );
- $this->assertEquals( 'https://user:pass@[::FFFF::127.0.0.1]:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url( $url ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'http://example.com?foo', esc_url( 'http://example.com?foo' ) );
</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"> function test_bare() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'http://example.com?foo', esc_url( 'example.com?foo' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'http://example.com', esc_url( 'example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'http://localhost', esc_url( 'localhost' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'http://example.com/foo', esc_url( 'example.com/foo' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,46 +126,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">- * @ticket 16859
- */
- function test_square_brackets() {
- $this->assertEquals( '/example.php?one%5B%5D=two', esc_url( '/example.php?one[]=two' ) );
- $this->assertEquals( '?foo%5Bbar%5D=baz', esc_url( '?foo[bar]=baz' ) );
- $this->assertEquals( '//example.com/?foo%5Bbar%5D=baz', esc_url( '//example.com/?foo[bar]=baz' ) );
- $this->assertEquals( 'http://example.com/?foo%5Bbar%5D=baz', esc_url( 'example.com/?foo[bar]=baz' ) );
- $this->assertEquals( 'http://localhost?foo%5Bbar%5D=baz', esc_url( 'localhost?foo[bar]=baz' ) );
- $this->assertEquals( 'http://user:pass@localhost/?foo%5Bbar%5D=baz', esc_url( 'http://user:pass@localhost/?foo[bar]=baz' ) );
- $this->assertEquals( 'http://localhost?foo%5Bbar%5D=baz', esc_url( 'localhost?foo[bar]=baz' ) );
- $this->assertEquals( 'http://example.com/?foo%5Bbar%5D=baz', esc_url( 'http://example.com/?foo[bar]=baz' ) );
- $this->assertEquals( 'http://example.com:1234/?foo%5Bbar%5D=baz', esc_url( 'http://example.com:1234/?foo[bar]=baz' ) );
- $this->assertEquals( 'http://example.com/?foo%5Bbar%5D=baz', esc_url( 'http://example.com/?foo%5Bbar%5D=baz' ) );
- $this->assertEquals( 'http://example.com/?baz=bar&foo%5Bbar%5D=baz', esc_url( 'http://example.com/?baz=bar&foo[bar]=baz' ) );
- $this->assertEquals( 'http://example.com/?baz=bar&foo%5Bbar%5D=baz', esc_url( 'http://example.com/?baz=bar&foo%5Bbar%5D=baz' ) );
- }
-
- /**
- * @ticket 16859
- */
- function test_ipv6_hosts() {
- $this->assertEquals( '//[::127.0.0.1]', esc_url( '//[::127.0.0.1]' ) );
- $this->assertEquals( 'http://[::FFFF::127.0.0.1]', esc_url( 'http://[::FFFF::127.0.0.1]' ) );
- $this->assertEquals( 'http://[::127.0.0.1]', esc_url( 'http://[::127.0.0.1]' ) );
- $this->assertEquals( 'http://[::DEAD:BEEF:DEAD:BEEF:DEAD:BEEF:DEAD:BEEF]', esc_url( 'http://[::DEAD:BEEF:DEAD:BEEF:DEAD:BEEF:DEAD:BEEF]' ) );
-
- // IPv6 with square brackets in the query? Why not.
- $this->assertEquals( '//[::FFFF::127.0.0.1]/?foo%5Bbar%5D=baz', esc_url( '//[::FFFF::127.0.0.1]/?foo[bar]=baz' ) );
- $this->assertEquals( 'http://[::FFFF::127.0.0.1]/?foo%5Bbar%5D=baz', esc_url( 'http://[::FFFF::127.0.0.1]/?foo[bar]=baz' ) );
- }
-
- /**
- * Courtesy of http://blog.lunatech.com/2009/02/03/what-every-web-developer-must-know-about-url-encoding
- */
- function test_reserved_characters() {
- $url = "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$%27()*+,;=/?:@-._~!$%27()*+,;==#/?:@-._~!$&'()*+,;=";
- $this->assertEquals( $url, esc_url_raw( $url ) );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21974
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_protocol_relative_with_colon() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28015
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_invalid_charaters() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEmpty( esc_url_raw('"^<>{}`') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( esc_url_raw('"^[]<>{}`') );
</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"> }
</span></span></pre>
</div>
</div>
</body>
</html>