mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

tweak fix for #15111 on last time. morse had the logic right the first time, 

we need to subtract the # of seconds between 1970 and 1900 from the mac cookies,
not add.
This commit is contained in:
sspitzer%netscape.com 1999-12-07 22:05:52 +00:00
Родитель d94ccc85f2
Коммит 4bd1b240f5
1 изменённых файлов: 2 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
profile/pref-migrator/src/nsPrefMigration.cpp
Просмотреть файл

@ -165,7 +165,7 @@ typedef struct
* 1970. In 5.0 it was made cross platform so that all platforms use * 1970. In 5.0 it was made cross platform so that all platforms use
* expiration times starting from 1970. That means that mac cookies * expiration times starting from 1970. That means that mac cookies
* generated in 4.x cannot be migrated to 5.0 as is -- instead the * generated in 4.x cannot be migrated to 5.0 as is -- instead the
* expiration time must first be increased by * expiration time must first be decreased by
* the number of seconds between 1-1-1900 and 1-1-1970 * the number of seconds between 1-1-1900 and 1-1-1970
* *
* 70 years * 365 days/year * 86,400 secs/day = 2,207,520,000 seconds * 70 years * 365 days/year * 86,400 secs/day = 2,207,520,000 seconds
@ -1468,7 +1468,7 @@ Fix4xCookies(nsIFileSpec * profilePath) {
* expires == 0. don't adjust those cookies. * expires == 0. don't adjust those cookies.
*/ */
if (expires) { if (expires) {
expires += SECONDS_BETWEEN_1900_AND_1970; expires -= SECONDS_BETWEEN_1900_AND_1970;
} }
char dateString[36]; char dateString[36];
PR_snprintf(dateString, sizeof(dateString), "%lu", expires); PR_snprintf(dateString, sizeof(dateString), "%lu", expires);