diff --git a/checkin_notes b/checkin_notes index 86d67d005e..22e3cb9606 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3275,3 +3275,9 @@ David 3 Jun 2011 sched/ sched_version.cpp + +Charlie 3 Jun 2011 + - MGR: Convert Google Chrome browser time (microseconds since + January 1, 1601) to UNIX time (seconds since January 1, 1970) + clientgui/ + browser.cpp diff --git a/clientgui/browser.cpp b/clientgui/browser.cpp index e29c6d818b..00baa2a677 100644 --- a/clientgui/browser.cpp +++ b/clientgui/browser.cpp @@ -769,10 +769,18 @@ static int find_site_cookie_chrome( &expires ); sscanf( argv[4], +#ifdef _WIN32 + "%I64d", +#else "%ld", +#endif &httponly ); + // Convert Google Chrome time (microseconds since January 1, 1601) + // to UNIX time (seconds since January 1, 1970) + expires = (expires / 1000000) - 11644473600LL; + // is this a real cookie? // temporary cookie? these cookies do not trickle back up // to the jscript interface, so ignore them.