diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
| commit | ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5 (patch) | |
| tree | 483da9c8b66f4444bb8a410e3d599c7484ad721e /conf/httpd.conf | |
| parent | daa2d6b1c40354ecce0e48e6c5ee686efe642c4b (diff) | |
| parent | 2f8b999750cc700faf03c6aee1c53d1fc4df767f (diff) | |
| download | bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.gz bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.xz | |
Merge branch 'master' into unstable
Diffstat (limited to 'conf/httpd.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 |