<!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>[42907] branches/3.7: Login: Use `wp_safe_redirect()` when redirecting the login page if forced to use HTTPS.</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/42907">42907</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/42907","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-04-03 15:29:44 +0000 (Tue, 03 Apr 2018)</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'>Login: Use `wp_safe_redirect()` when redirecting the login page if forced to use HTTPS.
Merge of <a href="https://core.trac.wordpress.org/changeset/42892">[42892]</a> to the 3.7 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches37srcwploginphp">branches/3.7/src/wp-login.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches37">branches/3.7/</a></li>
<li><a href="#branches37src">branches/3.7/src/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/3.7
</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/3.7 2018-04-03 15:29:37 UTC (rev 42906)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/3.7 2018-04-03 15:29:44 UTC (rev 42907)
</ins><a id="branches37"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/3.7</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/4.6:38615,41414
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.8:42478
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:42434
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26014,26016-26017,26148-26149,26186,26304-26305,26448-26449,26734,26782,26927,27385,27872,27905-27906,27928,27964,27975,27990,28053,28113,28129,29327,29378,29381-29382,29397,29404,29631,29783,30412,30417,30425,30430,30438,30443,30458,30466,33124,33142,36083,36435,37651,38524,39645,39659,39759,39795,39807-39808,39831,39850,39956,40148,40169,40183,40400,40677,40692,40704,40723,40736,41393,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42433
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26014,26016-26017,26148-26149,26186,26304-26305,26448-26449,26734,26782,26927,27385,27872,27905-27906,27928,27964,27975,27990,28053,28113,28129,29327,29378,29381-29382,29397,29404,29631,29783,30412,30417,30425,30430,30438,30443,30458,30466,33124,33142,36083,36435,37651,38524,39645,39659,39759,39795,39807-39808,39831,39850,39956,40148,40169,40183,40400,40677,40692,40704,40723,40736,41393,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42433,42892
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><span class="cx" style="display: block; padding: 0 10px">Index: branches/3.7/src
</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/3.7/src 2018-04-03 15:29:37 UTC (rev 42906)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/3.7/src 2018-04-03 15:29:44 UTC (rev 42907)
</ins><a id="branches37src"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/3.7/src</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/4.6/src:38615
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.8/src:42478
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9/src:42434
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk/src:18512,25880,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26149,26449,27385,27906,27928,28113,28129,29783,33124,33142,36083,36435,37651,38524,39645,39659,39759,39795,39807-39808,39831,39850,39956,40148,40169,40183,40400,40677,40692,40704,40723,40736,41393,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk/src:18512,25880,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26149,26449,27385,27906,27928,28113,28129,29783,33124,33142,36083,36435,37651,38524,39645,39659,39759,39795,39807-39808,39831,39850,39956,40148,40169,40183,40400,40677,40692,40704,40723,40736,41393,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42892
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches37srcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.7/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.7/src/wp-login.php 2018-04-03 15:29:37 UTC (rev 42906)
+++ branches/3.7/src/wp-login.php 2018-04-03 15:29:44 UTC (rev 42907)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,10 +14,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Redirect to https login if forced to use SSL
</span><span class="cx" style="display: block; padding: 0 10px"> if ( force_ssl_admin() && ! is_ssl() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_safe_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_safe_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit();
</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>