From 9d7214842b8843582a42cc569e15aae1564ab072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ba=CC=81lint=20Szekeres?= <balint.szekeres@feat.agency>
Date: Thu, 17 Oct 2019 14:43:35 +0200
Subject: [PATCH] fastcgi_split_path_info with location regex fix

---
 cli/stubs/secure.valet.conf | 6 ++++--
 cli/stubs/valet.conf        | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cli/stubs/secure.valet.conf b/cli/stubs/secure.valet.conf
index 42d1167..a533354 100644
--- a/cli/stubs/secure.valet.conf
+++ b/cli/stubs/secure.valet.conf
@@ -33,12 +33,13 @@ server {
 
     error_page 404 "VALET_SERVER_PATH";
 
-    location ~ \.php$ {
+    location ~ [^/]\.php(/|$) {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass "unix:VALET_HOME_PATH/valet.sock";
         fastcgi_index "VALET_SERVER_PATH";
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME "VALET_SERVER_PATH";
+        fastcgi_param PATH_INFO $fastcgi_path_info;
     }
 
     location ~ /\.ht {
@@ -71,12 +72,13 @@ server {
 
     error_page 404 "VALET_SERVER_PATH";
 
-    location ~ \.php$ {
+    location ~ [^/]\.php(/|$) {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass "unix:VALET_HOME_PATH/valet.sock";
         fastcgi_index "VALET_SERVER_PATH";
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME "VALET_SERVER_PATH";
+        fastcgi_param PATH_INFO $fastcgi_path_info;
     }
 
     location ~ /\.ht {
diff --git a/cli/stubs/valet.conf b/cli/stubs/valet.conf
index 6c3bc0c..a11066a 100644
--- a/cli/stubs/valet.conf
+++ b/cli/stubs/valet.conf
@@ -22,12 +22,13 @@ server {
 
     error_page 404 "VALET_SERVER_PATH";
 
-    location ~ \.php$ {
+    location ~ [^/]\.php(/|$) {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass "unix:VALET_HOME_PATH/valet.sock";
         fastcgi_index "VALET_SERVER_PATH";
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME "VALET_SERVER_PATH";
+        fastcgi_param PATH_INFO $fastcgi_path_info;
     }
 
     location ~ /\.ht {