update NEWS with phar enabling, fix swapping of time/date in timestamp saving for...

diff --git a/NEWS b/NEWS
index a7ae320505f45165a74963272711b355ee856969..30c660f74b5d0ec9686d914699acaad8f533028f 100644 (file)
--- 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 921b61d0ec01baba3fade6189c72536ef84fdb23..143ecc818c81e8d20b4d6de8a7e5ec3df0c9479b 100644 (file)
--- 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);
 }