Ticket #41877: 41877.patch

wp-admin/includes/misc.php

@@ -39 +39 @@
  * @since 3.7.0
  *
  * @global bool $is_nginx
+ * @global bool $is_caddy
  *
  * @return bool Whether the server supports URL rewriting.
  */
 function got_url_rewrite() {
-        $got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks() );
+        $got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || $GLOBALS['is_caddy'] || iis7_supports_permalinks() );
 
         /**
          * Filters whether URL rewriting is available.

wp-admin/options-permalink.php

@@ -75 +75 @@
                 $writable = true;
         else
                 $writable = false;
-} elseif ( $is_nginx ) {
+} elseif ( $is_nginx || $is_caddy ) {
         $writable = false;
 } else {
         if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
@@ -134 +134 @@
                 } elseif ( $permalink_structure && ! $using_index_permalinks && $writable ) {
                         $message = __( 'Permalink structure updated. Remove write access on web.config file now!' );
                 }
-        } elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) {
+        } elseif ( ! $is_nginx  && ! $is_caddy && $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) {
                 $message = __( 'You should update your .htaccess now.' );
         }
 

wp-includes/vars.php

@@ -17 +17 @@
 
 global $pagenow,
         $is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE, $is_edge,
-        $is_apache, $is_IIS, $is_iis7, $is_nginx;
+        $is_apache, $is_IIS, $is_iis7, $is_nginx, $is_caddy;
 
 // On which page are we ?
 if ( is_admin() ) {
@@ -106 +106 @@
 $is_nginx = (strpos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false);
 
 /**
+ * Whether the server software is Caddy or something else
+ * @global bool $is_caddy
+ */
+$is_caddy = (strpos($_SERVER['SERVER_SOFTWARE'], 'Caddy') !== false);
+
+/**
  * Whether the server software is IIS or something else
  * @global bool $is_IIS
  */