summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2018-02-16 02:49:33 +0100
committerGitHub <noreply@github.com>2018-02-16 02:49:33 +0100
commitc345cbc05311d8ecc51752c59b102d0323bcfb6c (patch)
tree417969289899fa6f561a1db3af0398639a4441b7 /Bugzilla
parentdacda12b6d8ab2802eaa562dd1267e3799673166 (diff)
downloadbugzilla-c345cbc05311d8ecc51752c59b102d0323bcfb6c.tar.gz
bugzilla-c345cbc05311d8ecc51752c59b102d0323bcfb6c.tar.xz
no bug - add USE_NYTPROF to PerlPassEnv (#395)
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Install/Filesystem.pm17
1 files changed, 10 insertions, 7 deletions
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index 89a1e5d93..e1e9a47d7 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -102,13 +102,16 @@ use constant INDEX_HTML => <<'EOT';
</html>
EOT
-sub HTTPD_ENV_CONF {
+use constant HTTPD_ENV => qw(
+ LOCALCONFIG_ENV
+ BUGZILLA_UNSAFE_AUTH_DELEGATION
+ USE_NYTPROF
+ NYTPROF_DIR
+);
- return join( "\n",
- "PerlPassEnv LOCALCONFIG_ENV",
- "PerlPassEnv BUGZILLA_UNSAFE_AUTH_DELEGATION",
- map { "PerlPassEnv " . $_ } ENV_KEYS
- ) . "\n";
+sub HTTPD_ENV_CONF {
+ my @env = (ENV_KEYS, HTTPD_ENV);
+ return join( "\n", map { "PerlPassEnv " . $_ } @env ) . "\n";
}
###############
@@ -304,7 +307,7 @@ sub FILESYSTEM {
js => { files => WS_SERVE,
dirs => DIR_WS_SERVE },
static => { files => WS_SERVE,
- dirs => DIR_WS_SERVE },
+ dirs => DIR_WS_SERVE },
$skinsdir => { files => WS_SERVE,
dirs => DIR_WS_SERVE },
'docs/*/html' => { files => WS_SERVE,