<!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>[25456] trunk/src: Add nginx detection to the Permalink Settings screen.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25456">25456</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-09-16 20:06:27 +0000 (Mon, 16 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add nginx detection to the Permalink Settings screen.
Introduces got_url_rewrite() and a corresponding filter, which should now be used in lieu of the got_rewrite filter in got_mod_rewrite().
This does not write or even suggest nginx configuration; rather, it prevents nginx from being considered as either Apache or as an unrecognized server.
props johnbillion.
fixes <a href="http://core.trac.wordpress.org/ticket/25098">#25098</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
<li><a href="#trunksrcwpincludesvarsphp">trunk/src/wp-includes/vars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/misc.php (25455 => 25456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/misc.php 2013-09-16 18:29:18 UTC (rev 25455)
+++ trunk/src/wp-admin/includes/misc.php 2013-09-16 20:06:27 UTC (rev 25456)
</span><span class="lines">@@ -7,18 +7,51 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Returns whether the server is running Apache with the mod_rewrite module loaded.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> *
</span><del>- * @return unknown
</del><ins>+ * @return bool
</ins><span class="cx"> */
</span><span class="cx"> function got_mod_rewrite() {
</span><span class="cx"> $got_rewrite = apache_mod_loaded('mod_rewrite', true);
</span><ins>+
+ /**
+ * Filter whether Apache and mod_rewrite are present.
+ *
+ * This filter was previously used to force URL rewriting for other servers,
+ * like nginx. Use the got_url_rewrite filter in got_url_rewrite() instead.
+ *
+ * @see got_url_rewrite()
+ *
+ * @since 2.5.0
+ * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
+ */
</ins><span class="cx"> return apply_filters('got_rewrite', $got_rewrite);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Returns whether the server supports URL rewriting.
+ *
+ * Detects Apache's mod_rewrite, IIS 7.0+ permalink support, and nginx.
+ *
+ * @since 3.7.0
+ *
+ * @return bool Whether the server supports URL rewriting.
+ */
+function got_url_rewrite() {
+ $got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks() );
+
+ /**
+ * Filter whether URL rewriting is available.
+ *
+ * @since 3.7.0
+ * @param bool $got_url_rewrite Whether URL rewriting is available.
+ */
+ return apply_filters( 'got_url_rewrite', $got_url_rewrite );
+}
+
+/**
</ins><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span></span></pre></div>
<a id="trunksrcwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options-permalink.php (25455 => 25456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options-permalink.php 2013-09-16 18:29:18 UTC (rev 25455)
+++ trunk/src/wp-admin/options-permalink.php 2013-09-16 20:06:27 UTC (rev 25456)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> $iis7_permalinks = iis7_supports_permalinks();
</span><span class="cx">
</span><span class="cx"> $prefix = $blog_prefix = '';
</span><del>-if ( ! got_mod_rewrite() && ! $iis7_permalinks )
</del><ins>+if ( ! got_url_rewrite() )
</ins><span class="cx"> $prefix = '/index.php';
</span><span class="cx"> if ( is_multisite() && !is_subdomain_install() && is_main_site() )
</span><span class="cx"> $blog_prefix = '/blog';
</span><span class="lines">@@ -126,6 +126,8 @@
</span><span class="cx"> $writable = true;
</span><span class="cx"> else
</span><span class="cx"> $writable = false;
</span><ins>+} elseif ( $is_nginx ) {
+ $writable = false;
</ins><span class="cx"> } else {
</span><span class="cx"> if ( ( ! file_exists($home_path . '.htaccess') && is_writable($home_path) ) || is_writable($home_path . '.htaccess') )
</span><span class="cx"> $writable = true;
</span><span class="lines">@@ -152,6 +154,8 @@
</span><span class="cx"> _e('Permalink structure updated. Remove write access on web.config file now!');
</span><span class="cx"> else
</span><span class="cx"> _e('Permalink structure updated.');
</span><ins>+ } elseif ( $is_nginx ) {
+ _e('Permalink structure updated.');
</ins><span class="cx"> } else {
</span><span class="cx"> if ( $permalink_structure && ! $usingpi && ! $writable )
</span><span class="cx"> _e('You should update your .htaccess now.');
</span><span class="lines">@@ -226,9 +230,9 @@
</span><span class="cx">
</span><span class="cx"> <h3 class="title"><?php _e('Optional'); ?></h3>
</span><span class="cx"> <?php
</span><del>-$suffix = '';
-if ( ! $is_apache && ! $iis7_permalinks )
- $suffix = $wp_rewrite->index . '/';
</del><ins>+$suffix = $prefix;
+if ( $suffix )
+ $suffix = ltrim( $suffix, '/' ) . '/';
</ins><span class="cx"> ?>
</span><span class="cx"> <p><?php
</span><span class="cx"> /* translators: %s is a placeholder that must come at the start of the URL path. */
</span><span class="lines">@@ -269,7 +273,7 @@
</span><span class="cx"> <p><?php _e('If you temporarily make your site’s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><del>-<?php else :
</del><ins>+<?php elseif ( ! $is_nginx ) :
</ins><span class="cx"> if ( $permalink_structure && ! $usingpi && ! $writable ) : ?>
</span><span class="cx"> <p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
</span><span class="cx"> <form action="options-permalink.php" method="post">
</span></span></pre></div>
<a id="trunksrcwpincludesvarsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/vars.php (25455 => 25456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/vars.php 2013-09-16 18:29:18 UTC (rev 25455)
+++ trunk/src/wp-includes/vars.php 2013-09-16 20:06:27 UTC (rev 25456)
</span><span class="lines">@@ -87,6 +87,12 @@
</span><span class="cx"> $is_apache = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false);
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Whether the server software is Nginx or something else
+ * @global bool $is_nginx
+ */
+$is_nginx = (strpos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false);
+
+/**
</ins><span class="cx"> * Whether the server software is IIS or something else
</span><span class="cx"> * @global bool $is_IIS
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>