Bug 399066 - Remove the 'cookiedomain' parameter

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index d43a68f93c76970ac05b3237020c0c4552c603b4..de4bd23d31212dbeebaf5e693bea3ed9fbf47924 100644 (file)
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -451,8 +451,7 @@ sub send_cookie {
     # Add the default path and the domain in.
     my $uri = URI->new(Bugzilla->params->{urlbase});
     $paramhash{'-path'} = $uri->path;
-    $paramhash{'-domain'} = Bugzilla->params->{'cookiedomain'}
-        if Bugzilla->params->{'cookiedomain'};
+    $paramhash{'-domain'} = $uri->host if $uri->host;
 
     push(@{$self->{'Bugzilla_cookie_list'}}, $self->cookie(%paramhash));
 }

diff --git a/Bugzilla/Config/Advanced.pm b/Bugzilla/Config/Advanced.pm
index b3968a25464876e8163e21dca3026c2972b0bf0d..7a61bf7c47b78526d82684bd3bb18d63e9d3cf72 100644 (file)
--- a/Bugzilla/Config/Advanced.pm
+++ b/Bugzilla/Config/Advanced.pm
@@ -16,12 +16,6 @@ use Bugzilla::Config::Common;
 our $sortkey = 1700;
 
 use constant get_param_list => (
-  {
-   name => 'cookiedomain',
-   type => 't',
-   default => ''
-  },
-
   {
    name => 'inbound_proxies',
    type => 't',

diff --git a/docs/en/rst/administering/parameters.rst b/docs/en/rst/administering/parameters.rst
index 5835d654f018e22cc2809b0802430e416a2c7687..3b4b42983e306beec512c2d14e9ae660c15e19b6 100644 (file)
--- a/docs/en/rst/administering/parameters.rst
+++ b/docs/en/rst/administering/parameters.rst
@@ -239,10 +239,6 @@ attachment_base
     :param:`urlbase` or :param:`sslbase`. That is, a different domain name that
     resolves to this exact same Bugzilla installation.
 
-    Note that if you have set the :param:`cookiedomain` parameter, you should
-    set :param:`attachment_base` to use a domain that would not be matched by
-    :param:`cookiedomain`.
-
     For added security, you can insert ``%bugid%`` into the URL, which will be
     replaced with the ID of the current bug that the attachment is on, when you
     access an attachment. This will limit attachments to accessing only other
@@ -825,15 +821,6 @@ confirmuniqueusermatch
 Advanced
 ========
 
-cookiedomain
-    Defines the domain for Bugzilla cookies. This is typically left blank.
-    If there are multiple hostnames that point to the same webserver, which
-    require the same cookie, then this parameter can be utilized. For
-    example, If your website is at
-    ``https://bugzilla.example.com/``, setting this to
-    :paramval:`.example.com/` will also allow
-    ``attachments.example.com/`` to access Bugzilla cookies.
-
 inbound_proxies
     When inbound traffic to Bugzilla goes through a proxy, Bugzilla thinks that
     the IP address of the proxy is the IP address of every single user. If you

diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
index 1aedc9f9b097dad30ee0ee3d5eb4092fb54add72..70171bd5399d2afc9777976f002f3675c3756e1c 100644 (file)
--- a/template/en/default/admin/params/advanced.html.tmpl
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -41,13 +41,6 @@
 [% END %]
 
 [% param_descs = {
-  cookiedomain => 
-    "If your website is at 'www.foo.com', setting this to"
-    _ " '.foo.com' will also allow 'bar.foo.com' to access"
-    _ " Bugzilla cookies. This is useful if you have more than"
-    _ " one hostname pointing at the same web server, and you"
-    _ " want them to share the Bugzilla cookie.",
-
   inbound_proxies =>
     "When inbound traffic to Bugzilla goes through a proxy,"
     _ " Bugzilla thinks that the IP address of every single"

diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl
index c850802ab954e395113a7e893148dfbd6d549035..1e65f0ca4ca49a115b93b0877af88d1116b0d3e3 100644 (file)
--- a/template/en/default/admin/params/attachment.html.tmpl
+++ b/template/en/default/admin/params/attachment.html.tmpl
@@ -31,11 +31,6 @@
     _ " that is not the same as <var>urlbase</var> or <var>sslbase</var>."
     _ " That is, a different domain name that resolves to this exact"
     _ " same Bugzilla installation.</p>"
-    _ "<p>Note that if you have set the"
-    _ " <a href=\"editparams.cgi?section=advanced#cookiedomain_desc\"><var>cookiedomain</var>"
-    _" parameter</a>, you should set <var>attachment_base</var> to use a"
-    _ " domain that would <em>not</em> be matched by"
-    _ " <var>cookiedomain</var>.</p>"
     _ "<p>For added security, you can insert <var>%bugid%</var> into the URL,"
     _ " which will be replaced with the ID of the current $terms.bug that"
     _ " the attachment is on, when you access an attachment. This will limit"