From 9448b32db29ad8eb5b5554f87ee6ebd19a623693 Mon Sep 17 00:00:00 2001
From: melbahja <elbahjamohamed0@gmail.com>
Date: Wed, 6 Aug 2025 20:49:10 +0100
Subject: [PATCH 1/2] Add custom Caddyfile configuration and HTTPS options for
 FrankenPHP in Octane docs

---
 octane.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/octane.md b/octane.md
index f371a44809..69871cef19 100644
--- a/octane.md
+++ b/octane.md
@@ -137,6 +137,17 @@ If the `--log-level` option is explicitly passed to the `php artisan octane:star
 
 You may consult [the official FrankenPHP documentation](https://frankenphp.dev/docs/docker/) for more information on running FrankenPHP with Docker.
 
+<a name="frankenphp-caddyfile"></a>
+#### Custom Caddyfile Configuration
+
+When using FrankenPHP, you may specify a custom Caddyfile using the `--caddyfile` option when starting Octane:
+
+```shell
+php artisan octane:start --server=frankenphp --caddyfile=/path/to/your/Caddyfile
+```
+
+This allows you to customize FrankenPHP's configuration beyond the default settings, such as adding custom middleware, configuring advanced routing, or setting up custom directives. You may consult the [official Caddy documentation](https://caddyserver.com/docs/caddyfile) for more information on Caddyfile syntax and configuration options.
+
 <a name="roadrunner"></a>
 ### RoadRunner
 
@@ -256,6 +267,21 @@ By default, applications running via Octane generate links prefixed with `http:/
 'https' => env('OCTANE_HTTPS', false),
 ```
 
+When using FrankenPHP, you may enable HTTPS by using the `--https` flag when starting Octane:
+
+```shell
+php artisan octane:start --server=frankenphp --https
+```
+
+Additionally, you may enable automatic HTTP to HTTPS redirection by using the `--http-redirect` option along with `--https`:
+
+```shell
+php artisan octane:start --server=frankenphp --https --http-redirect
+```
+
+> [!NOTE]
+> The `--http-redirect` option is only available when using FrankenPHP and requires the `--https` flag to be enabled.
+
 <a name="serving-your-application-via-nginx"></a>
 ### Serving Your Application via Nginx
 

From 267517a50246fecf6d30e79bb82e7dad416a5bd2 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Wed, 6 Aug 2025 15:18:50 -0500
Subject: [PATCH 2/2] Update octane.md

---
 octane.md | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/octane.md b/octane.md
index 69871cef19..5cdb94c449 100644
--- a/octane.md
+++ b/octane.md
@@ -267,21 +267,6 @@ By default, applications running via Octane generate links prefixed with `http:/
 'https' => env('OCTANE_HTTPS', false),
 ```
 
-When using FrankenPHP, you may enable HTTPS by using the `--https` flag when starting Octane:
-
-```shell
-php artisan octane:start --server=frankenphp --https
-```
-
-Additionally, you may enable automatic HTTP to HTTPS redirection by using the `--http-redirect` option along with `--https`:
-
-```shell
-php artisan octane:start --server=frankenphp --https --http-redirect
-```
-
-> [!NOTE]
-> The `--http-redirect` option is only available when using FrankenPHP and requires the `--https` flag to be enabled.
-
 <a name="serving-your-application-via-nginx"></a>
 ### Serving Your Application via Nginx