diff options
| author | David Lawrence <dkl@mozilla.com> | 2016-01-14 22:20:18 +0100 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2016-01-14 22:20:18 +0100 |
| commit | 35429919e6438ee05a5bc9413952cc30fed9e6b6 (patch) | |
| tree | d6f03599c989b3f0d095669fbb01544434ec0d31 /Bugzilla | |
| parent | 2db58cfea492eeba77be6c9ef099c16f0b175388 (diff) | |
| download | bugzilla-35429919e6438ee05a5bc9413952cc30fed9e6b6.tar.gz bugzilla-35429919e6438ee05a5bc9413952cc30fed9e6b6.tar.xz | |
Bug 1239582 - The new REST API fails to work properly under mod_perl due to improper file path passed to bsd_glob()
r=dylan
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/API/1_0/Server.pm | 6 | ||||
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Bugzilla/API/1_0/Server.pm b/Bugzilla/API/1_0/Server.pm index d9780bd63..743af59a1 100644 --- a/Bugzilla/API/1_0/Server.pm +++ b/Bugzilla/API/1_0/Server.pm @@ -20,7 +20,7 @@ use Bugzilla::Hook; use Bugzilla::Util qw(datetime_from trick_taint); use File::Basename qw(basename); -use File::Glob qw(bsd_glob); +use File::Glob qw(:bsd_glob); use List::MoreUtils qw(none uniq); use MIME::Base64 qw(decode_base64 encode_base64); use Moo; @@ -359,8 +359,8 @@ sub _find_resource { $api_namespace, 'API', $api_ext_version, 'Resource', '*.pm'); } else { - $resource_modules = File::Spec->catdir('Bugzilla','API', $api_version, - 'Resource', '*.pm'); + $resource_modules = File::Spec->catdir(bz_locations()->{cgi_path}, + 'Bugzilla','API', $api_version, 'Resource', '*.pm'); } # Load in the WebService modules from the appropriate version directory diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index a48778c1b..ccd3a649a 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -492,8 +492,8 @@ use constant FEATURE_FILES => ( jsonrpc => ['Bugzilla/WebService/Server/JSONRPC.pm', 'jsonrpc.cgi'], xmlrpc => ['Bugzilla/WebService/Server/XMLRPC.pm', 'xmlrpc.cgi', 'Bugzilla/WebService.pm', 'Bugzilla/WebService/*.pm'], - rest => ['Bugzilla/WebService/Server/REST.pm', 'rest.cgi', - 'Bugzilla/WebService/Server/REST/Resources/*.pm'], + rest => ['Bugzilla/API/Server.pm', 'rest.cgi', + 'Bugzilla/API/*/Server.pm', 'Bugzilla/API/*/Resource/*.pm'], psgi => ['app.psgi'], moving => ['importxml.pl'], auth_ldap => ['Bugzilla/Auth/Verify/LDAP.pm'], |