From 3ed63823292a454ef08580287c8389848dd72efe Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Thu, 4 Apr 2024 13:40:06 +0000
Subject: [PATCH] Permalinks: Detect FrankenPHP web server support.

Support pretty permalinks when FrankenPHP server is detected, which is built on top of Caddy. Caddy detection was added in [57612].

Props swissspidy, stephenmiracle.
Fixes #60884.
Built from https://develop.svn.wordpress.org/trunk@57923


git-svn-id: http://core.svn.wordpress.org/trunk@57424 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/vars.php    | 4 ++--
 wp-includes/version.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index 74a9cef032..b719b48d2e 100644
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -127,11 +127,11 @@ $is_apache = ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'Apache' ) || str_cont
 $is_nginx = ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) );
 
 /**
- * Whether the server software is Caddy or something else.
+ * Whether the server software is Caddy / FrankenPHP or something else.
  *
  * @global bool $is_caddy
  */
-$is_caddy = ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'Caddy' ) );
+$is_caddy = ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'Caddy' ) || str_contains( $_SERVER['SERVER_SOFTWARE'], 'FrankenPHP' ) );
 
 /**
  * Whether the server software is IIS or something else.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e2ba1dab69..519d2ede42 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.6-alpha-57922';
+$wp_version = '6.6-alpha-57923';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.