Skip to content

Commit 341c3dd

Browse files
falkotimmefalkotimme
committed
- Fixed FS#2199 - Modifying fastcgi_params in nginx clashes with nginx_apps.vhost.master.
1 parent 183c476 commit 341c3dd

File tree

2 files changed

+200
-8
lines changed

2 files changed

+200
-8
lines changed

‎install/tpl/nginx_apps.vhost.master‎

Lines changed: 100 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,31 @@ server {
1818

1919
location ~ \.php$ {
2020
try_files $uri =404;
21-
include /etc/nginx/fastcgi_params;
21+
fastcgi_param QUERY_STRING $query_string;
22+
fastcgi_param REQUEST_METHOD $request_method;
23+
fastcgi_param CONTENT_TYPE $content_type;
24+
fastcgi_param CONTENT_LENGTH $content_length;
25+
26+
fastcgi_param SCRIPT_FILENAME $request_filename;
27+
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
28+
fastcgi_param REQUEST_URI $request_uri;
29+
fastcgi_param DOCUMENT_URI $document_uri;
30+
fastcgi_param DOCUMENT_ROOT $document_root;
31+
fastcgi_param SERVER_PROTOCOL $server_protocol;
32+
33+
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
34+
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
35+
36+
fastcgi_param REMOTE_ADDR $remote_addr;
37+
fastcgi_param REMOTE_PORT $remote_port;
38+
fastcgi_param SERVER_ADDR $server_addr;
39+
fastcgi_param SERVER_PORT $server_port;
40+
fastcgi_param SERVER_NAME $server_name;
41+
42+
fastcgi_param HTTPS $https;
43+
44+
# PHP only, required if PHP was built with --enable-force-cgi-redirect
45+
fastcgi_param REDIRECT_STATUS 200;
2246
fastcgi_pass unix:{fpm_socket};
2347
fastcgi_index index.php;
2448
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
@@ -39,7 +63,31 @@ server {
3963
location ~ ^/phpmyadmin/(.+\.php)$ {
4064
try_files $uri =404;
4165
root /usr/share/;
42-
include /etc/nginx/fastcgi_params;
66+
fastcgi_param QUERY_STRING $query_string;
67+
fastcgi_param REQUEST_METHOD $request_method;
68+
fastcgi_param CONTENT_TYPE $content_type;
69+
fastcgi_param CONTENT_LENGTH $content_length;
70+
71+
fastcgi_param SCRIPT_FILENAME $request_filename;
72+
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
73+
fastcgi_param REQUEST_URI $request_uri;
74+
fastcgi_param DOCUMENT_URI $document_uri;
75+
fastcgi_param DOCUMENT_ROOT $document_root;
76+
fastcgi_param SERVER_PROTOCOL $server_protocol;
77+
78+
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
79+
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
80+
81+
fastcgi_param REMOTE_ADDR $remote_addr;
82+
fastcgi_param REMOTE_PORT $remote_port;
83+
fastcgi_param SERVER_ADDR $server_addr;
84+
fastcgi_param SERVER_PORT $server_port;
85+
fastcgi_param SERVER_NAME $server_name;
86+
87+
fastcgi_param HTTPS $https;
88+
89+
# PHP only, required if PHP was built with --enable-force-cgi-redirect
90+
fastcgi_param REDIRECT_STATUS 200;
4391
# To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used
4492
{use_tcp}fastcgi_pass 127.0.0.1:9000;
4593
{use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;
@@ -65,7 +113,31 @@ server {
65113
location ~ ^/squirrelmail/(.+\.php)$ {
66114
try_files $uri =404;
67115
root /usr/share/;
68-
include /etc/nginx/fastcgi_params;
116+
fastcgi_param QUERY_STRING $query_string;
117+
fastcgi_param REQUEST_METHOD $request_method;
118+
fastcgi_param CONTENT_TYPE $content_type;
119+
fastcgi_param CONTENT_LENGTH $content_length;
120+
121+
fastcgi_param SCRIPT_FILENAME $request_filename;
122+
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
123+
fastcgi_param REQUEST_URI $request_uri;
124+
fastcgi_param DOCUMENT_URI $document_uri;
125+
fastcgi_param DOCUMENT_ROOT $document_root;
126+
fastcgi_param SERVER_PROTOCOL $server_protocol;
127+
128+
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
129+
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
130+
131+
fastcgi_param REMOTE_ADDR $remote_addr;
132+
fastcgi_param REMOTE_PORT $remote_port;
133+
fastcgi_param SERVER_ADDR $server_addr;
134+
fastcgi_param SERVER_PORT $server_port;
135+
fastcgi_param SERVER_NAME $server_name;
136+
137+
fastcgi_param HTTPS $https;
138+
139+
# PHP only, required if PHP was built with --enable-force-cgi-redirect
140+
fastcgi_param REDIRECT_STATUS 200;
69141
# To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used
70142
{use_tcp}fastcgi_pass 127.0.0.1:9000;
71143
{use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;
@@ -87,7 +159,31 @@ server {
87159
location /cgi-bin/mailman {
88160
root /usr/lib/;
89161
fastcgi_split_path_info (^/cgi-bin/mailman/[^/]*)(.*)$;
90-
include /etc/nginx/fastcgi_params;
162+
fastcgi_param QUERY_STRING $query_string;
163+
fastcgi_param REQUEST_METHOD $request_method;
164+
fastcgi_param CONTENT_TYPE $content_type;
165+
fastcgi_param CONTENT_LENGTH $content_length;
166+
167+
fastcgi_param SCRIPT_FILENAME $request_filename;
168+
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
169+
fastcgi_param REQUEST_URI $request_uri;
170+
fastcgi_param DOCUMENT_URI $document_uri;
171+
fastcgi_param DOCUMENT_ROOT $document_root;
172+
fastcgi_param SERVER_PROTOCOL $server_protocol;
173+
174+
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
175+
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
176+
177+
fastcgi_param REMOTE_ADDR $remote_addr;
178+
fastcgi_param REMOTE_PORT $remote_port;
179+
fastcgi_param SERVER_ADDR $server_addr;
180+
fastcgi_param SERVER_PORT $server_port;
181+
fastcgi_param SERVER_NAME $server_name;
182+
183+
fastcgi_param HTTPS $https;
184+
185+
# PHP only, required if PHP was built with --enable-force-cgi-redirect
186+
fastcgi_param REDIRECT_STATUS 200;
91187
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
92188
fastcgi_param PATH_INFO $fastcgi_path_info;
93189
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;

‎server/conf/nginx_apps.vhost.master‎

Lines changed: 100 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,31 @@ server {
1818

1919
location ~ \.php$ {
2020
try_files $uri =404;
21-
include /etc/nginx/fastcgi_params;
21+
fastcgi_param QUERY_STRING $query_string;
22+
fastcgi_param REQUEST_METHOD $request_method;
23+
fastcgi_param CONTENT_TYPE $content_type;
24+
fastcgi_param CONTENT_LENGTH $content_length;
25+
26+
fastcgi_param SCRIPT_FILENAME $request_filename;
27+
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
28+
fastcgi_param REQUEST_URI $request_uri;
29+
fastcgi_param DOCUMENT_URI $document_uri;
30+
fastcgi_param DOCUMENT_ROOT $document_root;
31+
fastcgi_param SERVER_PROTOCOL $server_protocol;
32+
33+
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
34+
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
35+
36+
fastcgi_param REMOTE_ADDR $remote_addr;
37+
fastcgi_param REMOTE_PORT $remote_port;
38+
fastcgi_param SERVER_ADDR $server_addr;
39+
fastcgi_param SERVER_PORT $server_port;
40+
fastcgi_param SERVER_NAME $server_name;
41+
42+
fastcgi_param HTTPS $https;
43+
44+
# PHP only, required if PHP was built with --enable-force-cgi-redirect
45+
fastcgi_param REDIRECT_STATUS 200;
2246
fastcgi_pass unix:{fpm_socket};
2347
fastcgi_index index.php;
2448
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
@@ -39,7 +63,31 @@ server {
3963
location ~ ^/phpmyadmin/(.+\.php)$ {
4064
try_files $uri =404;
4165
root /usr/share/;
42-
include /etc/nginx/fastcgi_params;
66+
fastcgi_param QUERY_STRING $query_string;
67+
fastcgi_param REQUEST_METHOD $request_method;
68+
fastcgi_param CONTENT_TYPE $content_type;
69+
fastcgi_param CONTENT_LENGTH $content_length;
70+
71+
fastcgi_param SCRIPT_FILENAME $request_filename;
72+
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
73+
fastcgi_param REQUEST_URI $request_uri;
74+
fastcgi_param DOCUMENT_URI $document_uri;
75+
fastcgi_param DOCUMENT_ROOT $document_root;
76+
fastcgi_param SERVER_PROTOCOL $server_protocol;
77+
78+
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
79+
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
80+
81+
fastcgi_param REMOTE_ADDR $remote_addr;
82+
fastcgi_param REMOTE_PORT $remote_port;
83+
fastcgi_param SERVER_ADDR $server_addr;
84+
fastcgi_param SERVER_PORT $server_port;
85+
fastcgi_param SERVER_NAME $server_name;
86+
87+
fastcgi_param HTTPS $https;
88+
89+
# PHP only, required if PHP was built with --enable-force-cgi-redirect
90+
fastcgi_param REDIRECT_STATUS 200;
4391
# To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used
4492
{use_tcp}fastcgi_pass 127.0.0.1:9000;
4593
{use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;
@@ -65,7 +113,31 @@ server {
65113
location ~ ^/squirrelmail/(.+\.php)$ {
66114
try_files $uri =404;
67115
root /usr/share/;
68-
include /etc/nginx/fastcgi_params;
116+
fastcgi_param QUERY_STRING $query_string;
117+
fastcgi_param REQUEST_METHOD $request_method;
118+
fastcgi_param CONTENT_TYPE $content_type;
119+
fastcgi_param CONTENT_LENGTH $content_length;
120+
121+
fastcgi_param SCRIPT_FILENAME $request_filename;
122+
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
123+
fastcgi_param REQUEST_URI $request_uri;
124+
fastcgi_param DOCUMENT_URI $document_uri;
125+
fastcgi_param DOCUMENT_ROOT $document_root;
126+
fastcgi_param SERVER_PROTOCOL $server_protocol;
127+
128+
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
129+
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
130+
131+
fastcgi_param REMOTE_ADDR $remote_addr;
132+
fastcgi_param REMOTE_PORT $remote_port;
133+
fastcgi_param SERVER_ADDR $server_addr;
134+
fastcgi_param SERVER_PORT $server_port;
135+
fastcgi_param SERVER_NAME $server_name;
136+
137+
fastcgi_param HTTPS $https;
138+
139+
# PHP only, required if PHP was built with --enable-force-cgi-redirect
140+
fastcgi_param REDIRECT_STATUS 200;
69141
# To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used
70142
{use_tcp}fastcgi_pass 127.0.0.1:9000;
71143
{use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;
@@ -87,7 +159,31 @@ server {
87159
location /cgi-bin/mailman {
88160
root /usr/lib/;
89161
fastcgi_split_path_info (^/cgi-bin/mailman/[^/]*)(.*)$;
90-
include /etc/nginx/fastcgi_params;
162+
fastcgi_param QUERY_STRING $query_string;
163+
fastcgi_param REQUEST_METHOD $request_method;
164+
fastcgi_param CONTENT_TYPE $content_type;
165+
fastcgi_param CONTENT_LENGTH $content_length;
166+
167+
fastcgi_param SCRIPT_FILENAME $request_filename;
168+
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
169+
fastcgi_param REQUEST_URI $request_uri;
170+
fastcgi_param DOCUMENT_URI $document_uri;
171+
fastcgi_param DOCUMENT_ROOT $document_root;
172+
fastcgi_param SERVER_PROTOCOL $server_protocol;
173+
174+
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
175+
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
176+
177+
fastcgi_param REMOTE_ADDR $remote_addr;
178+
fastcgi_param REMOTE_PORT $remote_port;
179+
fastcgi_param SERVER_ADDR $server_addr;
180+
fastcgi_param SERVER_PORT $server_port;
181+
fastcgi_param SERVER_NAME $server_name;
182+
183+
fastcgi_param HTTPS $https;
184+
185+
# PHP only, required if PHP was built with --enable-force-cgi-redirect
186+
fastcgi_param REDIRECT_STATUS 200;
91187
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
92188
fastcgi_param PATH_INFO $fastcgi_path_info;
93189
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;

0 commit comments

Comments
 (0)