Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix support of the X-Forwarded-Proto header for fastcgi. #166

Merged
merged 1 commit into from
Mar 26, 2014
Merged

Fix support of the X-Forwarded-Proto header for fastcgi. #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/drupal/fastcgi_drupal.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ fastcgi_param SCRIPT_FILENAME $document_root/index.php;
## later. The if_not_empty flag was introduced in 1.1.11. See:
## http://nginx.org/en/CHANGES. If using a version that doesn't
## support this comment out the line below.
fastcgi_param HTTPS $https if_not_empty;
fastcgi_param HTTPS $fastcgi_https if_not_empty;
## For Nginx versions below 1.1.11 uncomment the line below after commenting out the above.
#fastcgi_param HTTPS $https;
#fastcgi_param HTTPS $fastcgi_https;

## 2. Nginx FCGI specific directives.
fastcgi_buffers 256 4k;
Expand Down
4 changes: 2 additions & 2 deletions apps/drupal/fastcgi_no_args_drupal.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ fastcgi_param SCRIPT_FILENAME $document_root/index.php;
## later. The if_not_empty flag was introduced in 1.1.11. See:
## http://nginx.org/en/CHANGES. If using a version that doesn't
## support this comment out the line below.
fastcgi_param HTTPS $https if_not_empty;
fastcgi_param HTTPS $fastcgi_https if_not_empty;
## For Nginx versions below 1.1.11 uncomment the line below after commenting out the above.
#fastcgi_param HTTPS $https;
#fastcgi_param HTTPS $fastcgi_https;

## 2. Nginx FCGI specific directives.
fastcgi_buffers 256 4k;
Expand Down
4 changes: 2 additions & 2 deletions fastcgi_params
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ fastcgi_param REDIRECT_STATUS 200;
## later. The if_not_empty flag was introduced in 1.1.11. See:
## http://nginx.org/en/CHANGES. If using a version that doesn't
## support this comment out the line below.
fastcgi_param HTTPS $https if_not_empty;
fastcgi_param HTTPS $fastcgi_https if_not_empty;
## For Nginx versions below 1.1.11 uncomment the line below after commenting out the above.
#fastcgi_param HTTPS $https;
#fastcgi_param HTTPS $fastcgi_https;
4 changes: 0 additions & 4 deletions map_https_forwarded_proto.conf
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,12 @@ http {
## previous version then uncomment out the line below.
#include map_https_fcgi.conf;

## Include this line, if used in a loadbalanced environment
## and comment the line which includes map_https_fcgi.conf.
## If the loadbalancer always sends the request in http protocol,
## and adds the server variable $http_x_forwarded_proto
#include map_https_forwarded_proto.conf;
# Support the X-Forwarded-Proto header for fastcgi.
map $http_x_forwarded_proto $fastcgi_https {
default $https;
http '';
https on;
}

## Include the upstream servers for Apache handling the PHP
## processes. In this case Nginx functions as a reverse proxy.
Expand Down