Changeset 57612

Timestamp:

02/13/2024 10:06:22 AM (11 months ago)

Author:

swissspidy

Message:

Permalinks: Detect Caddy web server support.

Support pretty permalinks when Caddy server is detected.

Props swissspidy, mukesh27, sadpencil, cfinnberg, viliamkopecky.
Fixes #41877.

Location:

trunk/src

Files:

• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/options-permalink.php (modified) (2 diffs)
• wp-includes/vars.php (modified) (2 diffs)

trunk/src/wp-admin/includes/misc.php

@@ -40 +40 @@
  *
  * @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() );
 
     /**

trunk/src/wp-admin/options-permalink.php

@@ -155 +155 @@
         $writable = false;
     }
-} elseif ( $is_nginx ) {
+} elseif ( $is_nginx || $is_caddy ) {
     $writable = false;
 } else {
@@ -191 +191 @@
                 );
             }
-        } elseif ( ! $is_nginx && $htaccess_update_required && ! $writable ) {
+        } elseif ( ! $is_nginx && ! $is_caddy && $htaccess_update_required && ! $writable ) {
             $message = sprintf(
                 /* translators: %s: .htaccess */

trunk/src/wp-includes/vars.php

@@ -18 +18 @@
 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?
@@ -128 +128 @@
 
 /**
+ * Whether the server software is Caddy or something else
+ *
+ * @global bool $is_caddy
+ */
+$is_caddy = ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'Caddy' ) );
+
+/**
  * Whether the server software is IIS or something else
  *