diff options
| -rw-r--r-- | Bugzilla/API/1_0/Resource/Bugzilla.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/CGI.pm | 3 | ||||
| -rw-r--r-- | Bugzilla/Config/Core.pm | 6 | ||||
| -rw-r--r-- | Bugzilla/WebService/Bugzilla.pm | 2 | ||||
| -rw-r--r-- | docs/en/rst/administering/parameters.rst | 9 | ||||
| -rw-r--r-- | docs/en/rst/api/core/v1/bugzilla.rst | 2 | ||||
| -rw-r--r-- | template/en/default/admin/params/core.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 1 | ||||
| -rw-r--r-- | template/en/default/welcome-admin.html.tmpl | 3 |
9 files changed, 2 insertions, 34 deletions
diff --git a/Bugzilla/API/1_0/Resource/Bugzilla.pm b/Bugzilla/API/1_0/Resource/Bugzilla.pm index de9925e69..d7c3ab401 100644 --- a/Bugzilla/API/1_0/Resource/Bugzilla.pm +++ b/Bugzilla/API/1_0/Resource/Bugzilla.pm @@ -62,7 +62,6 @@ use constant PARAMETERS_LOGGED_IN => qw( attachment_base commentonchange_resolution commentonduplicate - cookiepath defaultopsys defaultplatform defaultpriority @@ -443,7 +442,6 @@ A logged-in user can access the following parameters (listed alphabetically): C<attachment_base>, C<commentonchange_resolution>, C<commentonduplicate>, - C<cookiepath>, C<defaultopsys>, C<defaultplatform>, C<defaultpriority>, diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm index 0b1712d2f..fcca0ec6a 100644 --- a/Bugzilla/CGI.pm +++ b/Bugzilla/CGI.pm @@ -430,7 +430,8 @@ sub send_cookie { ThrowCodeError('cookies_need_value') unless $paramhash{'-value'}; # Add the default path and the domain in. - $paramhash{'-path'} = Bugzilla->params->{'cookiepath'}; + my $uri = URI->new(Bugzilla->params->{urlbase}); + $paramhash{'-path'} = $uri->path; $paramhash{'-domain'} = Bugzilla->params->{'cookiedomain'} if Bugzilla->params->{'cookiedomain'}; diff --git a/Bugzilla/Config/Core.pm b/Bugzilla/Config/Core.pm index 654e569ba..de375e448 100644 --- a/Bugzilla/Config/Core.pm +++ b/Bugzilla/Config/Core.pm @@ -35,12 +35,6 @@ use constant get_param_list => ( default => '', checker => \&check_sslbase }, - - { - name => 'cookiepath', - type => 't', - default => '/' - }, ); 1; diff --git a/Bugzilla/WebService/Bugzilla.pm b/Bugzilla/WebService/Bugzilla.pm index a9cef32fc..c0b44a04c 100644 --- a/Bugzilla/WebService/Bugzilla.pm +++ b/Bugzilla/WebService/Bugzilla.pm @@ -56,7 +56,6 @@ use constant PARAMETERS_LOGGED_IN => qw( attachment_base commentonchange_resolution commentonduplicate - cookiepath defaultopsys defaultplatform defaultpriority @@ -412,7 +411,6 @@ A logged-in user can access the following parameters (listed alphabetically): C<attachment_base>, C<commentonchange_resolution>, C<commentonduplicate>, - C<cookiepath>, C<defaultopsys>, C<defaultplatform>, C<defaultpriority>, diff --git a/docs/en/rst/administering/parameters.rst b/docs/en/rst/administering/parameters.rst index f040bcfc6..974e7a16d 100644 --- a/docs/en/rst/administering/parameters.rst +++ b/docs/en/rst/administering/parameters.rst @@ -40,15 +40,6 @@ sslbase the :param:`sslbase` should be set to :paramval:`https://www.foo.com/bugzilla/`. -cookiepath - Defines a path, relative to the web document root, that Bugzilla - cookies will be restricted to. For example, if the - :param:`urlbase` is set to - :file:`http://www.foo.com/bugzilla/`, the - :param:`cookiepath` should be set to - :paramval:`/bugzilla/`. Setting it to :paramval:`/` will allow all sites - served by this web server or virtual host to read Bugzilla cookies. - .. _param-general: General diff --git a/docs/en/rst/api/core/v1/bugzilla.rst b/docs/en/rst/api/core/v1/bugzilla.rst index c2458bd0f..5aca556ec 100644 --- a/docs/en/rst/api/core/v1/bugzilla.rst +++ b/docs/en/rst/api/core/v1/bugzilla.rst @@ -171,7 +171,6 @@ Example response for authenticated user: "attachment_base" : "http://bugzilla.example.com/", "commentonchange_resolution" : "0", "commentonduplicate" : "0", - "cookiepath" : "/", "createemailregexp" : ".*", "defaultopsys" : "", "defaultplatform" : "", @@ -209,7 +208,6 @@ A logged-in user can access the following parameters (listed alphabetically): * attachment_base * commentonchange_resolution * commentonduplicate -* cookiepath * defaultopsys * defaultplatform * defaultpriority diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl index d7703b5b8..decd8895a 100644 --- a/template/en/default/admin/params/core.html.tmpl +++ b/template/en/default/admin/params/core.html.tmpl @@ -24,12 +24,4 @@ _ " using the <var>sslbase</var> parameter. Also, when this is enabled," _ " Bugzilla will send out links using <var>sslbase</var> in emails" _ " instead of <var>urlbase</var>.", - - cookiepath => "Path, relative to your web document root, to which to restrict " _ - "Bugzilla cookies. Normally this is the URI portion of your URL " _ - "base. Begin with a / (single slash mark). For instance, if " _ - "Bugzilla serves from 'http://www.somedomain.com/bugzilla/', set " _ - "this parameter to /bugzilla/. Setting it to / will allow " _ - "all sites served by this web server or virtual host to read " _ - "Bugzilla cookies.", } %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index b05784ebe..98cd42980 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -183,7 +183,6 @@ #%] var BUGZILLA = { param: { - cookiepath: '[% Param('cookiepath') FILTER js %]', maxusermatches: [% Param('maxusermatches') FILTER js %] }, constant: { diff --git a/template/en/default/welcome-admin.html.tmpl b/template/en/default/welcome-admin.html.tmpl index a9b30f68a..5b586a015 100644 --- a/template/en/default/welcome-admin.html.tmpl +++ b/template/en/default/welcome-admin.html.tmpl @@ -36,9 +36,6 @@ reason you see this page: as long as this parameter is not set, you will see this page again and again).</li> - <li><a href="editparams.cgi?section=core#cookiepath_desc">cookiepath</a> is important - for your browser to manage your cookies correctly.</li> - <li><a href="editparams.cgi?section=general#maintainer_desc">maintainer</a>, the person responsible for this installation if something is running wrongly.</li> |