diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:46:28 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:46:28 +0200 |
| commit | 2f8b999750cc700faf03c6aee1c53d1fc4df767f (patch) | |
| tree | ef00bf6fd9932fd4fa1fc69e3108a1c5603aa64a /conf | |
| parent | c6d0d0e31a8b7b0e3c46ddf0a2be7741716d7977 (diff) | |
| parent | 45485679f2e173170ed9c0e8a0eae979fe9de067 (diff) | |
| download | bugzilla-2f8b999750cc700faf03c6aee1c53d1fc4df767f.tar.gz bugzilla-2f8b999750cc700faf03c6aee1c53d1fc4df767f.tar.xz | |
Merge branch 'master' of git://github.com/mozilla-bteam/bmo
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/httpd.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/httpd.conf b/conf/httpd.conf index 20a21f5db..7fe859b59 100644 --- a/conf/httpd.conf +++ b/conf/httpd.conf @@ -4,7 +4,8 @@ ServerRoot "/etc/httpd" ServerAdmin root@localhost PidFile /tmp/httpd.pid -Timeout 60 +Timeout 120 +LimitRequestLine 35000 KeepAlive Off MaxKeepAliveRequests 100 KeepAliveTimeout 15 @@ -91,7 +92,7 @@ DocumentRoot "/app" Alias "/bmo" "/app" </IfDefine> <IfDefine HTTPS> - SetEnv HTTPS on + SetEnvIf X-Forwarded-Proto "https" HTTPS=on </IfDefine> <Directory "/app"> Options -Indexes -FollowSymLinks |