<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13427] trunk: Use is_ssl() in place of manual SERVER['HTTPS'] == 'on'
checks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13427">13427</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-26 06:21:47 +0000 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is_ssl() in place of manual SERVER['HTTPS'] == 'on' checks. fixes <a href="http://trac.wordpress.org/ticket/11885">#11885</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (13426 => 13427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2010-02-26 06:14:26 UTC (rev 13426)
+++ trunk/wp-app.php 2010-02-26 06:21:47 UTC (rev 13427)
</span><span class="lines">@@ -224,10 +224,7 @@
</span><span class="cx"> function AtomServer() {
</span><span class="cx">
</span><span class="cx"> $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME']));
</span><del>- $this->app_base = get_bloginfo('url') . '/' . $this->script_name . '/';
- if ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) {
- $this->app_base = preg_replace( '/^http:\/\//', 'https://', $this->app_base );
- }
</del><ins>+ $this->app_base = home_url( $this->script_name . '/' );
</ins><span class="cx">
</span><span class="cx"> $this->selectors = array(
</span><span class="cx"> '@/service$@' =>
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (13426 => 13427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-02-26 06:14:26 UTC (rev 13426)
+++ trunk/wp-includes/canonical.php 2010-02-26 06:21:47 UTC (rev 13427)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !$requested_url ) {
</span><span class="cx"> // build the URL in the address bar
</span><del>- $requested_url = ( !empty($_SERVER['HTTPS'] ) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
</del><ins>+ $requested_url = is_ssl() ? 'https://' : 'http://';
</ins><span class="cx"> $requested_url .= $_SERVER['HTTP_HOST'];
</span><span class="cx"> $requested_url .= $_SERVER['REQUEST_URI'];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (13426 => 13427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-02-26 06:14:26 UTC (rev 13426)
+++ trunk/wp-includes/functions.php 2010-02-26 06:21:47 UTC (rev 13427)
</span><span class="lines">@@ -3337,7 +3337,7 @@
</span><span class="cx"> if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
</span><span class="cx"> $url = WP_SITEURL;
</span><span class="cx"> } else {
</span><del>- $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
</del><ins>+ $schema = is_ssl() ? 'https://' : 'http://';
</ins><span class="cx"> $url = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
</span><span class="cx"> }
</span><span class="cx"> return $url;
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (13426 => 13427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-02-26 06:14:26 UTC (rev 13426)
+++ trunk/wp-login.php 2010-02-26 06:21:47 UTC (rev 13427)
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
</span><span class="cx"> $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
</span><span class="cx">
</span><del>- $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
</del><ins>+ $schema = is_ssl() ? 'https://' : 'http://';
</ins><span class="cx"> if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
</span><span class="cx"> update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>