Author: cmlenz Date: Thu Feb 25 10:48:38 2010 New Revision: 916240 URL: http://svn.apache.org/viewvc?rev=916240&view=rev Log: Backport r915530 (Futon: Fix cookie storage for localhost.)
Modified: couchdb/branches/0.11.x/ (props changed) couchdb/branches/0.11.x/etc/default/couchdb (props changed) couchdb/branches/0.11.x/share/www/script/futon.js Propchange: couchdb/branches/0.11.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 25 10:48:38 2010 @@ -6,4 +6,4 @@ /couchdb/branches/list-iterator:782292-784593 /couchdb/branches/tail_header:775760-778477 /couchdb/tags/0.10.0:825400 -/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529,915827,916076,916153 +/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153 Propchange: couchdb/branches/0.11.x/etc/default/couchdb ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 25 10:48:38 2010 @@ -6,5 +6,5 @@ /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477 /couchdb/tags/0.10.0/etc/default/couchdb:825400 -/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529,915827,916076,916153 +/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440 Modified: couchdb/branches/0.11.x/share/www/script/futon.js URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/script/futon.js?rev=916240&r1=916239&r2=916240&view=diff ============================================================================== --- couchdb/branches/0.11.x/share/www/script/futon.js (original) +++ couchdb/branches/0.11.x/share/www/script/futon.js Thu Feb 25 10:48:38 2010 @@ -337,13 +337,13 @@ var date = new Date(); date.setTime(date.getTime() + 14*24*60*60*1000); // two weeks document.cookie = cookiePrefix + name + "=" + escape(value) + - "; domain=" + location.hostname + "; expires=" + date.toGMTString(); + "; expires=" + date.toGMTString(); }, del: function(name) { var date = new Date(); date.setTime(date.getTime() - 24*60*60*1000); // yesterday - document.cookie = cookiePrefix + name + "=; domain=" + - location.hostname + "; expires=" + date.toGMTString(); + document.cookie = cookiePrefix + name + "=" + + "; expires=" + date.toGMTString(); } },