From 299e201142b78daad06f5f93702c379d7476f845 Mon Sep 17 00:00:00 2001 From: kionez Date: Tue, 29 Oct 2019 15:47:28 +0100 Subject: [PATCH 1/2] Fix fastcgi_split_path_info --- lib/Froxlor/Cron/Http/NginxFcgi.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Froxlor/Cron/Http/NginxFcgi.php b/lib/Froxlor/Cron/Http/NginxFcgi.php index b2031613..60db493c 100644 --- a/lib/Froxlor/Cron/Http/NginxFcgi.php +++ b/lib/Froxlor/Cron/Http/NginxFcgi.php @@ -37,7 +37,7 @@ class NginxFcgi extends Nginx $php_options_text .= "\t" . 'location @php {' . "\n"; $php_options_text .= "\t\t" . 'try_files $1 =404;' . "\n\n"; $php_options_text .= "\t\t" . 'include ' . Settings::Get('nginx.fastcgiparams') . ";\n"; - $php_options_text .= "\t\t" . 'fastcgi_split_path_info ^(.+\.php)(/.+)\$;' . "\n"; + $php_options_text .= "\t\t" . 'fastcgi_split_path_info ^(.+\.php)(/.+)$;' . "\n"; $php_options_text .= "\t\t" . 'fastcgi_param SCRIPT_FILENAME $request_filename;' . "\n"; $php_options_text .= "\t\t" . 'fastcgi_param PATH_INFO $2;' . "\n"; if ($domain['ssl'] == '1' && $ssl_vhost) { From b0e920104f735ea06f099ee1be45816e53de10e9 Mon Sep 17 00:00:00 2001 From: kionez Date: Tue, 29 Oct 2019 16:00:14 +0100 Subject: [PATCH 2/2] Fix fastcgi_split_path_info as https://www.nginx.com/resources/wiki/start/topics/examples/phpfcgi/ --- lib/Froxlor/Cron/Http/Nginx.php | 4 ++-- lib/Froxlor/Cron/Http/NginxFcgi.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Froxlor/Cron/Http/Nginx.php b/lib/Froxlor/Cron/Http/Nginx.php index 84e69f8d..8d869103 100644 --- a/lib/Froxlor/Cron/Http/Nginx.php +++ b/lib/Froxlor/Cron/Http/Nginx.php @@ -285,7 +285,7 @@ class Nginx extends HttpConfigBase if (! $is_redirect) { $this->nginx_data[$vhost_filename] .= "\tlocation ~ \.php {\n"; - $this->nginx_data[$vhost_filename] .= "\t\tfastcgi_split_path_info ^(.+\.php)(/.+)\$;\n"; + $this->nginx_data[$vhost_filename] .= "\t\tfastcgi_split_path_info ^(.+?\.php)(/.*)$;\n"; $this->nginx_data[$vhost_filename] .= "\t\tinclude " . Settings::Get('nginx.fastcgiparams') . ";\n"; $this->nginx_data[$vhost_filename] .= "\t\tfastcgi_param SCRIPT_FILENAME \$request_filename;\n"; $this->nginx_data[$vhost_filename] .= "\t\tfastcgi_param PATH_INFO \$fastcgi_path_info;\n"; @@ -955,7 +955,7 @@ class Nginx extends HttpConfigBase $phpopts .= "\t" . '}' . "\n\n"; $phpopts .= "\tlocation @php {\n"; - $phpopts .= "\t\tfastcgi_split_path_info ^(.+\.php)(/.+)\$;\n"; + $phpopts .= "\t\tfastcgi_split_path_info ^(.+?\.php)(/.*)$;\n"; $phpopts .= "\t\tinclude " . Settings::Get('nginx.fastcgiparams') . ";\n"; $phpopts .= "\t\tfastcgi_param SCRIPT_FILENAME \$request_filename;\n"; $phpopts .= "\t\tfastcgi_param PATH_INFO \$fastcgi_path_info;\n"; diff --git a/lib/Froxlor/Cron/Http/NginxFcgi.php b/lib/Froxlor/Cron/Http/NginxFcgi.php index 60db493c..dc004ad3 100644 --- a/lib/Froxlor/Cron/Http/NginxFcgi.php +++ b/lib/Froxlor/Cron/Http/NginxFcgi.php @@ -37,7 +37,7 @@ class NginxFcgi extends Nginx $php_options_text .= "\t" . 'location @php {' . "\n"; $php_options_text .= "\t\t" . 'try_files $1 =404;' . "\n\n"; $php_options_text .= "\t\t" . 'include ' . Settings::Get('nginx.fastcgiparams') . ";\n"; - $php_options_text .= "\t\t" . 'fastcgi_split_path_info ^(.+\.php)(/.+)$;' . "\n"; + $php_options_text .= "\t\t" . 'fastcgi_split_path_info ^(.+?\.php)(/.*)$;' . "\n"; $php_options_text .= "\t\t" . 'fastcgi_param SCRIPT_FILENAME $request_filename;' . "\n"; $php_options_text .= "\t\t" . 'fastcgi_param PATH_INFO $2;' . "\n"; if ($domain['ssl'] == '1' && $ssl_vhost) {