From: Greg Beaver <cellog@php.net>
Date: Sun, 1 Mar 2009 06:58:01 +0000 (+0000)
Subject: update NEWS with phar enabling, fix swapping of time/date in timestamp saving for... 
X-Git-Tag: RELEASE_1_3_5~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6298331b5f87210a4bd5ef418295c85f4a8b950;p=php

update NEWS with phar enabling, fix swapping of time/date in timestamp saving for zip, which can cause crash on windows
---

diff --git a/NEWS b/NEWS
index a7ae320505..30c660f74b 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2009, PHP 5.3.0 Beta 2
 - Upgraded bundled sqlite to version 3.6.11. (Scott)
 
+- Re-enabled phar for big-endian systems after fixing problems. (Greg)
+
 - Fixed Bug #47443 (metaphone('scratch') returns wrong result). (Felipe)
 - Fixed bug #47438 (mysql_fetch_field ignores zero offset). (Johannes)
 - Fixed bug #47398 (PDO_Firebird doesn't implements quoter correctly). (Felipe)
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index 921b61d0ec..143ecc818c 100644
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -147,8 +147,8 @@ static void phar_zip_u2d_time(time_t time, char *dtime, char *ddate) /* {{{ */
 	struct tm *tm, tmbuf;
 
 	tm = php_localtime_r(&time, &tmbuf);
-	ctime = ((tm->tm_year+1900-1980)<<9) + ((tm->tm_mon+1)<<5) + tm->tm_mday;
-	cdate = ((tm->tm_hour)<<11) + ((tm->tm_min)<<5) + ((tm->tm_sec)>>1);
+	cdate = ((tm->tm_year+1900-1980)<<9) + ((tm->tm_mon+1)<<5) + tm->tm_mday;
+	ctime = ((tm->tm_hour)<<11) + ((tm->tm_min)<<5) + ((tm->tm_sec)>>1);
 	PHAR_SET_16(dtime, ctime);
 	PHAR_SET_16(ddate, cdate);
 }