Remove extraneous cookie configurations we don't use anymore.
Patch by kareila.
diffs (71 lines):
diff -r da3a730cf0ef -r 6e8b1fd26a08 cgi-bin/Apache/LiveJournal.pm
--- a/cgi-bin/Apache/LiveJournal.pm Sun May 02 06:16:50 2010 +0000
+++ b/cgi-bin/Apache/LiveJournal.pm Sun May 02 06:24:50 2010 +0000
@@ -1326,7 +1326,7 @@ sub journal_content
$r->content_type("text/html");
# reset all cookies
- foreach my $dom ( @LJ::COOKIE_DOMAIN_RESET ) {
+ foreach my $dom ( "", $LJ::DOMAIN, $LJ::COOKIE_DOMAIN ) {
DW::Request->get->add_cookie(
name => 'ljsession',
expires => LJ::time_to_cookie(1),
diff -r da3a730cf0ef -r 6e8b1fd26a08 cgi-bin/LJ/ConfCheck/General.pm
--- a/cgi-bin/LJ/ConfCheck/General.pm Sun May 02 06:16:50 2010 +0000
+++ b/cgi-bin/LJ/ConfCheck/General.pm Sun May 02 06:24:50 2010 +0000
@@ -114,18 +114,6 @@ add_conf('$COOKIE_DOMAIN',
add_conf('$COOKIE_DOMAIN',
required => 1,
des => "The 'domain' value set on cookies sent to users. By default,
value is \".\$DOMAIN\". Note the leading period, which is a wildcard for
everything at or under \$DOMAIN.",
- );
-
-add_conf('$COOKIE_PATH',
- required => 0,
- des => "The 'path' value set on cookies sent to users. By default,
value is \"/\", and any other value probably wouldn't work anyway.",
- STUPID_BECAUSE => "no use, since LJ must be rooted at /.",
- );
-
-add_conf('@COOKIE_DOMAIN_RESET',
- required => 0,
- des => "Array of cookie domain values to send when deleting cookies
from users. Only useful when changing domains, and even then kinda useless.",
- STUPID_BECAUSE => "ancient hack for one old specific use",
);
add_conf('$DB_LOG_HOST',
diff -r da3a730cf0ef -r 6e8b1fd26a08 cgi-bin/lj-bml-init.pl
--- a/cgi-bin/lj-bml-init.pl Sun May 02 06:16:50 2010 +0000
+++ b/cgi-bin/lj-bml-init.pl Sun May 02 06:24:50 2010 +0000
@@ -25,8 +25,8 @@ foreach (@LJ::LANGS, @LJ::LANGS_IN_PROGR
}
# set default path/domain for cookies
-BML::set_config("CookieDomain" => $LJ::COOKIE_DOMAIN);
-BML::set_config("CookiePath" => $LJ::COOKIE_PATH);
+BML::set_config( "CookieDomain" => $LJ::COOKIE_DOMAIN );
+BML::set_config( "CookiePath" => "/" );
BML::register_hook("startup", sub {
my $r = BML::get_request();
diff -r da3a730cf0ef -r 6e8b1fd26a08 cgi-bin/ljdefaults.pl
--- a/cgi-bin/ljdefaults.pl Sun May 02 06:16:50 2010 +0000
+++ b/cgi-bin/ljdefaults.pl Sun May 02 06:24:50 2010 +0000
@@ -74,8 +74,6 @@
# where we set the cookies (note the period before the domain)
$COOKIE_DOMAIN ||= ".$DOMAIN";
- $COOKIE_PATH ||= "/";
- @COOKIE_DOMAIN_RESET = ("", "$DOMAIN", ".$DOMAIN") unless
@COOKIE_DOMAIN_RESET;
$MAX_SCROLLBACK_LASTN ||= 100;
$MAX_SCROLLBACK_FRIENDS ||= 1000;
diff -r da3a730cf0ef -r 6e8b1fd26a08 etc/config.pl
--- a/etc/config.pl Sun May 02 06:16:50 2010 +0000
+++ b/etc/config.pl Sun May 02 06:24:50 2010 +0000
@@ -30,7 +30,6 @@
# can be one value or an array ref (to accomodate certain old
# broken browsers)
$COOKIE_DOMAIN = ".$DOMAIN";
- $COOKIE_PATH = "/";
# email addresses
$ADMIN_EMAIL = "webmast...@$domain";
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
