diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2014-09-11 01:53:07 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2014-09-11 01:53:07 +0200 |
| commit | e1603d01bbc3523b622db2f295400aa5a5f14509 (patch) | |
| tree | 53cfc18ee24e626912401bea9ab4be346e1e05ce /Bugzilla/Install | |
| parent | 5802599c4c23b92aee027d763d73002d1880e31e (diff) | |
| download | bugs-e1603d01bbc3523b622db2f295400aa5a5f14509.tar bugs-e1603d01bbc3523b622db2f295400aa5a5f14509.tar.gz bugs-e1603d01bbc3523b622db2f295400aa5a5f14509.tar.bz2 bugs-e1603d01bbc3523b622db2f295400aa5a5f14509.tar.xz bugs-e1603d01bbc3523b622db2f295400aa5a5f14509.zip | |
Bug 1052724: Use JSON::XS instead of Data::Dumper to store parameters into data/params
r=dkl r=wurblzap a=sgreen
Diffstat (limited to 'Bugzilla/Install')
| -rw-r--r-- | Bugzilla/Install/DB.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Install/Filesystem.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 13 |
3 files changed, 8 insertions, 9 deletions
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index 0b0603970..2bf3c0c1a 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -2561,7 +2561,7 @@ sub _fix_whine_queries_title_and_op_sys_value { undef, "Other", "other"); if (Bugzilla->params->{'defaultopsys'} eq 'other') { # We can't actually fix the param here, because WriteParams() will - # make $datadir/params unwriteable to the webservergroup. + # make $datadir/params.js unwriteable to the webservergroup. # It's too much of an ugly hack to copy the permission-fixing code # down to here. (It would create more potential future bugs than # it would solve problems.) diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 157a8429e..73536b4b5 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -171,7 +171,7 @@ sub FILESYSTEM { 'docs/style.css' => { perms => WS_SERVE }, 'docs/*/rel_notes.txt' => { perms => WS_SERVE }, 'docs/*/README.docs' => { perms => OWNER_WRITE }, - "$datadir/params" => { perms => CGI_WRITE }, + "$datadir/params.js" => { perms => CGI_WRITE }, "$datadir/old-params.txt" => { perms => OWNER_WRITE }, "$extensionsdir/create.pl" => { perms => OWNER_EXECUTE }, "$extensionsdir/*/*.pl" => { perms => WS_EXECUTE }, diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index 2ceb01cfd..bec753830 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -166,6 +166,12 @@ sub REQUIRED_MODULES { module => 'File::Slurp', version => '9999.13', }, + { + package => 'JSON-XS', + module => 'JSON::XS', + # 2.0 is the first version that will work with JSON::RPC. + version => '2.01', + }, ); if (ON_WINDOWS) { @@ -299,13 +305,6 @@ sub OPTIONAL_MODULES { feature => ['jsonrpc', 'rest'], }, { - package => 'JSON-XS', - module => 'JSON::XS', - # 2.0 is the first version that will work with JSON::RPC. - version => '2.0', - feature => ['jsonrpc_faster'], - }, - { package => 'Test-Taint', module => 'Test::Taint', # 1.06 no longer throws warnings with Perl 5.10+. |