<!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>[49055] trunk: Add ircs and irc6 to the list of allowed protocols.</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/49055">49055</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/49055","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>TimothyBlynJacobs</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-09-26 21:00:19 +0000 (Sat, 26 Sep 2020)</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'>Add ircs and irc6 to the list of allowed protocols.
This adds support for the secure and ipv6 variants of the already allowed irc protocol.
Props arealnobrainer, markparnell, ctmartin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenuitemsettingphp">trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsallowedProtocolsphp">trunk/tests/phpunit/tests/functions/allowedProtocols.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-09-26 18:54:48 UTC (rev 49054)
+++ trunk/src/wp-includes/functions.php 2020-09-26 21:00:19 UTC (rev 49055)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6295,13 +6295,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0 Added 'webcal' to the protocols array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 Added 'urn' to the protocols array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.3.0 Added 'sms' to the protocols array.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.6.0 Added 'irc6' and 'ircs' to the protocols array.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_kses()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see esc_url()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string[] Array of allowed protocols. Defaults to an array containing 'http', 'https',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet',
- * 'mms', 'rtsp', 'sms', 'svn', 'tel', 'fax', 'xmpp', 'webcal', and 'urn'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'ftp', 'ftps', 'mailto', 'news', 'irc', 'irc6', 'ircs', 'gopher', 'nntp', 'feed',
+ * 'telnet', 'mms', 'rtsp', 'sms', 'svn', 'tel', 'fax', 'xmpp', 'webcal', and 'urn'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * This covers all common link protocols, except for 'javascript' which should not
</span><span class="cx" style="display: block; padding: 0 10px"> * be allowed for untrusted users.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6309,7 +6310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> static $protocols = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $protocols ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'sms', 'svn', 'tel', 'fax', 'xmpp', 'webcal', 'urn' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'irc6', 'ircs', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'sms', 'svn', 'tel', 'fax', 'xmpp', 'webcal', 'urn' );
</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"> if ( ! did_action( 'wp_loaded' ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenuitemsettingphp"></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/customize/nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2020-09-26 18:54:48 UTC (rev 49054)
+++ trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2020-09-26 21:00:19 UTC (rev 49055)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,6 +516,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'ftps://example.com/',
</span><span class="cx" style="display: block; padding: 0 10px"> 'news://news.server.example/example.group.this',
</span><span class="cx" style="display: block; padding: 0 10px"> 'irc://irc.freenode.net/wordpress',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'irc6://irc.freenode.net/wordpress',
+ 'ircs://irc.freenode.net/wordpress',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'gopher://example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> 'nntp://news.server.example/example.group.this',
</span><span class="cx" style="display: block; padding: 0 10px"> 'feed://example.com/',
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsallowedProtocolsphp"></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/functions/allowedProtocols.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/allowedProtocols.php 2020-09-26 18:54:48 UTC (rev 49054)
+++ trunk/tests/phpunit/tests/functions/allowedProtocols.php 2020-09-26 21:00:19 UTC (rev 49055)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +46,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'mailto', 'mailto://someone@example.com' ), // RFC6068
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'news', 'news://news.server.example/example.group.this' ), // RFC5538
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'irc', 'irc://example.com/wordpress' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'irc6', 'irc6://example.com/wordpress' ),
+ array( 'ircs', 'ircs://example.com/wordpress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( 'gopher', 'gopher://example.com/7a_gopher_selector%09foobar' ), // RFC4266
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'nntp', 'nntp://news.server.example/example.group.this' ), // RFC5538
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'feed', 'feed://example.com/rss.xml' ),
</span></span></pre>
</div>
</div>
</body>
</html>