[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Apr 14 01:31:08 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2657r2=1.2658diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2657 php-src/ChangeLog:1.2658 --- php-src/ChangeLog:1.2657Fri Apr 13 01:31:11 2007 +++ php-src/ChangeLog Sat Apr 14 01:31:07 2007 @@ -1,3 +1,109 @@ +2007-04-13 Andrei Zmievski [EMAIL PROTECTED] + +* (PHP_5_2) + ext/json/JSON_parser.c + ext/json/json.c: + Fix processing of control characters; they should be escaped as \u + sequences. + +2007-04-13 Derick Rethans [EMAIL PROTECTED] + +* ext/date/lib/timezonedb.h: + - MFB: Updated timezone database to version 2007.5. (Derick) + +* (PHP_5_2) + NEWS + ext/date/lib/timezonedb.h: + - Updated timezone database to version 2007.5. (Derick) + +2007-04-13 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +* ZendEngine2/zend_execute.c + ZendEngine2/zend_execute.c: + fix #41075 (memleak when creating default object caused exception) + +2007-04-13 Derick Rethans [EMAIL PROTECTED] + +* ext/date/php_date.c: + - MFB: Fixed bug #39416 (Milliseconds in date()). + +* (PHP_5_2) + NEWS + ext/date/php_date.c: + - Fixed bug #39416 (Milliseconds in date()). + +2007-04-13 Antony Dovgal [EMAIL PROTECTED] + +* ZendEngine2/tests/bug41075.phpt: + add UEXPECTF + +* (PHP_5_2) + ZendEngine2/tests/bug41075.phpt: + add new test + +* ZendEngine2/tests/bug41075.phpt + ZendEngine2/tests/bug41075.phpt: + + new test + +* (PHP_5_2) + sapi/cli/tests/004.phpt + sapi/cli/tests/006.phpt: + fix tests + +2007-04-13 Derick Rethans [EMAIL PROTECTED] + +* ext/date/php_date.c + ext/date/tests/date_sun_info_001.phpt: + - MFB: Fixed bug #39965 (Latitude and longitude are backwards in + date_sun_info()). + +* (PHP_5_2) + NEWS + ext/date/php_date.c + ext/date/tests/date_sun_info_001.phpt + ext/date/tests/date_sun_info_002.phpt + ext/date/tests/date_sun_info_002.phpt: + - Fixed bug #39965 (Latitude and longitude are backwards in + date_sun_info()). + +* ext/date/lib/parse_date.c + ext/date/lib/parse_date.re: + - MFB: Fixed bug #40290 (strtotime() returns unexpected result with + particular +timezone offset). + +* (PHP_5_2) + NEWS + ext/date/lib/parse_date.c + ext/date/lib/parse_date.re: + - Fixed bug #40290 (strtotime() returns unexpected result with particular +timezone offset). + +2007-04-13 Brian Shire [EMAIL PROTECTED] + +* ext/standard/tests/strings/pack.phpt: + MFB: reverting incorrect changes to pack test + +* (PHP_5_2) + ext/standard/tests/strings/pack.phpt: + reverting incorrect changes to pack test + +2007-04-13 Stanislav Malyshev [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS: + fix for #38236 + +* (PHP_4_4) + main/php_variables.c + main/rfc1867.c: + fix for #38236 (patch by [EMAIL PROTECTED]) + 2007-04-12 Antony Dovgal [EMAIL PROTECTED] * (PHP_5_2)
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sat Apr 14 01:31:10 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1094r2=1.1095diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1094 ZendEngine2/ChangeLog:1.1095 --- ZendEngine2/ChangeLog:1.1094Thu Apr 12 01:31:02 2007 +++ ZendEngine2/ChangeLog Sat Apr 14 01:31:09 2007 @@ -1,3 +1,21 @@ +2007-04-13 Antony Dovgal [EMAIL PROTECTED] + +* zend_execute.c + zend_execute.c: + fix #41075 (memleak when creating default object caused exception) + +* tests/bug41075.phpt: + add UEXPECTF + +* (PHP_5_2) + tests/bug41075.phpt: + add new test + +* tests/bug41075.phpt + tests/bug41075.phpt: + + new test + 2007-04-11 Antony Dovgal [EMAIL PROTECTED] * tests/bug40770.phpt: @@ -17281,7 +17299,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1094 2007/04/12 01:31:02 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1095 2007/04/14 01:31:09 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -19005,7 +19023,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1094 2007/04/12 01:31:02 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1095 2007/04/14 01:31:09 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard pack.c /ext/standard/tests/strings pack.phpt
On 04/13/2007 06:17 AM, Brian Shire wrote:
FYI: Reverted my bad pack test changes, just verified that the latest
gcc-4.2 branch on Darwin returns 0 rather than -1 for the following
code:
#include stdio.h
int main() {
double foo = (double)4294967296LL;
printf(%d\n, (unsigned long)(foo));
}
Thanks!
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main snprintf.c
On 04/13/2007 02:47 AM, Marcus Boerger wrote:
Hello Antony,
under windows, where this is coming from (iirc), there is __int64. Is
that mapped to SIZEOF_LONG_LONG and don't you need to check for the
actual value being 8?
Ok, so it's always defined on Windows.
But there are also other platforms.
Friday, April 13, 2007, 12:00:56 AM, you wrote:
tony2001Thu Apr 12 22:00:56 2007 UTC
Modified files:
/php-src/main snprintf.c
Log:
add support for %I64(u|d) to sprintf() utilities
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.54r2=1.55diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.54 php-src/main/snprintf.c:1.55
--- php-src/main/snprintf.c:1.54Mon Apr 9 15:35:49 2007
+++ php-src/main/snprintf.c Thu Apr 12 22:00:56 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.54 2007/04/09 15:35:49 dmitry Exp $ */
+/* $Id: snprintf.c,v 1.55 2007/04/12 22:00:56 tony2001 Exp $ */
#include php.h
@@ -706,6 +706,16 @@
fmt++;
modifier = LM_LONG_DOUBLE;
break;
+ case 'I':
+ fmt++;
+#if SIZEOF_LONG_LONG
+ if (*fmt == '6' *(fmt+1) == '4') {
+ fmt += 2;
+ modifier = LM_LONG_LONG;
+ } else
+#endif
+ modifier = LM_LONG;
+ break;
case 'l':
fmt++;
#if SIZEOF_LONG_LONG
Best regards,
Marcus
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/date/lib parse_date.c parse_date.re
derick Fri Apr 13 08:11:16 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/date/lib parse_date.c parse_date.re
Log:
- Fixed bug #40290 (strtotime() returns unexpected result with particular
timezone offset).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.641r2=1.2027.2.547.2.642diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.641 php-src/NEWS:1.2027.2.547.2.642
--- php-src/NEWS:1.2027.2.547.2.641 Thu Apr 12 19:40:38 2007
+++ php-src/NEWSFri Apr 13 08:10:54 2007
@@ -8,6 +8,8 @@
(Ilia)
- Fixed bug #40861 (strtotime() doesn't handle double negative relative time
units correctly). (Derick)
+- Fixed bug #40290 (strtotime() returns unexpected result with particular
+ timezone offset). (Derick)
10 Apr 2007, PHP 5.2.2RC1
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.30.2.12r2=1.29.2.30.2.13diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.12
php-src/ext/date/lib/parse_date.c:1.29.2.30.2.13
--- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.12Wed Apr 11 14:37:28 2007
+++ php-src/ext/date/lib/parse_date.c Fri Apr 13 08:10:55 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.0 on Wed Apr 11 16:31:33 2007 */
+/* Generated by re2c 0.11.0 on Fri Apr 13 10:06:46 2007 */
#line 1 ext/date/lib/parse_date.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: parse_date.c,v 1.29.2.30.2.12 2007/04/11 14:37:28 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.30.2.13 2007/04/13 08:10:55 derick Exp $ */
#include timelib.h
@@ -21774,7 +21774,8 @@
} else {
timelib_error_container_dtor(in.errors);
}
- in.time-y = in.time-d = in.time-m = in.time-h = in.time-i
= in.time-s = in.time-f = in.time-z = in.time-dst = -1;
+ in.time-y = in.time-d = in.time-m = in.time-h = in.time-i
= in.time-s = in.time-f = in.time-dst = -1;
+ in.time-z = -99;
in.time-is_localtime = in.time-zone_type = 0;
return in.time;
}
@@ -21793,7 +21794,7 @@
in.time-i = -1;
in.time-s = -1;
in.time-f = -1;
- in.time-z = -1;
+ in.time-z = -99;
in.time-dst = -1;
in.tzdb = tzdb;
in.time-is_localtime = 0;
@@ -21830,7 +21831,7 @@
if (parsed-i == -1) parsed-i = now-i != -1 ? now-i : 0;
if (parsed-s == -1) parsed-s = now-s != -1 ? now-s : 0;
if (parsed-f == -1) parsed-f = now-f != -1 ? now-f : 0;
- if (parsed-z == -1) parsed-z = now-z != -1 ? now-z : 0;
+ if (parsed-z == -99) parsed-z = now-z != -99 ? now-z : 0;
if (parsed-dst == -1) parsed-dst = now-dst != -1 ? now-dst : 0;
if (!parsed-tz_abbr) {
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.26.2.27.2.10r2=1.26.2.27.2.11diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.26.2.27.2.10
php-src/ext/date/lib/parse_date.re:1.26.2.27.2.11
--- php-src/ext/date/lib/parse_date.re:1.26.2.27.2.10 Wed Apr 11 14:37:42 2007
+++ php-src/ext/date/lib/parse_date.re Fri Apr 13 08:11:07 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_date.re,v 1.26.2.27.2.10 2007/04/11 14:37:42 derick Exp $ */
+/* $Id: parse_date.re,v 1.26.2.27.2.11 2007/04/13 08:11:07 derick Exp $ */
#include timelib.h
@@ -1543,7 +1543,8 @@
} else {
timelib_error_container_dtor(in.errors);
}
- in.time-y = in.time-d = in.time-m = in.time-h = in.time-i
= in.time-s = in.time-f = in.time-z = in.time-dst = -1;
+ in.time-y = in.time-d = in.time-m = in.time-h = in.time-i
= in.time-s = in.time-f = in.time-dst = -1;
+ in.time-z = -99;
in.time-is_localtime = in.time-zone_type = 0;
return in.time;
}
@@ -1562,7 +1563,7 @@
in.time-i = -1;
in.time-s = -1;
in.time-f = -1;
- in.time-z = -1;
+ in.time-z = -99;
in.time-dst = -1;
in.tzdb = tzdb;
in.time-is_localtime = 0;
@@ -1599,7 +1600,7 @@
if (parsed-i == -1) parsed-i = now-i != -1 ? now-i : 0;
if (parsed-s == -1) parsed-s = now-s != -1 ? now-s : 0;
if (parsed-f == -1) parsed-f = now-f != -1 ? now-f : 0;
- if (parsed-z == -1) parsed-z = now-z != -1 ? now-z : 0;
+ if (parsed-z == -99) parsed-z = now-z != -99 ? now-z : 0;
if (parsed-dst == -1) parsed-dst = now-dst != -1 ? now-dst : 0;
if (!parsed-tz_abbr) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit:
[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c parse_date.re
derick Fri Apr 13 08:11:35 2007 UTC
Modified files:
/php-src/ext/date/lib parse_date.c parse_date.re
Log:
- MFB: Fixed bug #40290 (strtotime() returns unexpected result with particular
timezone offset).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.72r2=1.73diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.72
php-src/ext/date/lib/parse_date.c:1.73
--- php-src/ext/date/lib/parse_date.c:1.72 Wed Apr 11 14:36:44 2007
+++ php-src/ext/date/lib/parse_date.c Fri Apr 13 08:11:35 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.0 on Wed Apr 11 16:36:16 2007 */
+/* Generated by re2c 0.11.0 on Fri Apr 13 10:06:30 2007 */
#line 1 ext/date/lib/parse_date.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: parse_date.c,v 1.72 2007/04/11 14:36:44 derick Exp $ */
+/* $Id: parse_date.c,v 1.73 2007/04/13 08:11:35 derick Exp $ */
#include timelib.h
@@ -21774,7 +21774,8 @@
} else {
timelib_error_container_dtor(in.errors);
}
- in.time-y = in.time-d = in.time-m = in.time-h = in.time-i
= in.time-s = in.time-f = in.time-z = in.time-dst = -1;
+ in.time-y = in.time-d = in.time-m = in.time-h = in.time-i
= in.time-s = in.time-f = in.time-dst = -1;
+ in.time-z = -99;
in.time-is_localtime = in.time-zone_type = 0;
return in.time;
}
@@ -21793,7 +21794,7 @@
in.time-i = -1;
in.time-s = -1;
in.time-f = -1;
- in.time-z = -1;
+ in.time-z = -99;
in.time-dst = -1;
in.tzdb = tzdb;
in.time-is_localtime = 0;
@@ -21830,7 +21831,7 @@
if (parsed-i == -1) parsed-i = now-i != -1 ? now-i : 0;
if (parsed-s == -1) parsed-s = now-s != -1 ? now-s : 0;
if (parsed-f == -1) parsed-f = now-f != -1 ? now-f : 0;
- if (parsed-z == -1) parsed-z = now-z != -1 ? now-z : 0;
+ if (parsed-z == -99) parsed-z = now-z != -99 ? now-z : 0;
if (parsed-dst == -1) parsed-dst = now-dst != -1 ? now-dst : 0;
if (!parsed-tz_abbr) {
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.63r2=1.64diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.63
php-src/ext/date/lib/parse_date.re:1.64
--- php-src/ext/date/lib/parse_date.re:1.63 Wed Apr 11 14:36:45 2007
+++ php-src/ext/date/lib/parse_date.re Fri Apr 13 08:11:35 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_date.re,v 1.63 2007/04/11 14:36:45 derick Exp $ */
+/* $Id: parse_date.re,v 1.64 2007/04/13 08:11:35 derick Exp $ */
#include timelib.h
@@ -1543,7 +1543,8 @@
} else {
timelib_error_container_dtor(in.errors);
}
- in.time-y = in.time-d = in.time-m = in.time-h = in.time-i
= in.time-s = in.time-f = in.time-z = in.time-dst = -1;
+ in.time-y = in.time-d = in.time-m = in.time-h = in.time-i
= in.time-s = in.time-f = in.time-dst = -1;
+ in.time-z = -99;
in.time-is_localtime = in.time-zone_type = 0;
return in.time;
}
@@ -1562,7 +1563,7 @@
in.time-i = -1;
in.time-s = -1;
in.time-f = -1;
- in.time-z = -1;
+ in.time-z = -99;
in.time-dst = -1;
in.tzdb = tzdb;
in.time-is_localtime = 0;
@@ -1599,7 +1600,7 @@
if (parsed-i == -1) parsed-i = now-i != -1 ? now-i : 0;
if (parsed-s == -1) parsed-s = now-s != -1 ? now-s : 0;
if (parsed-f == -1) parsed-f = now-f != -1 ? now-f : 0;
- if (parsed-z == -1) parsed-z = now-z != -1 ? now-z : 0;
+ if (parsed-z == -99) parsed-z = now-z != -99 ? now-z : 0;
if (parsed-dst == -1) parsed-dst = now-dst != -1 ? now-dst : 0;
if (!parsed-tz_abbr) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/date php_date.c /ext/date/tests date_sun_info_001.phpt date_sun_info_002.phpt
derick Fri Apr 13 08:33:49 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/date/tests date_sun_info_002.phpt
Modified files:
/php-srcNEWS
/php-src/ext/date php_date.c
/php-src/ext/date/tests date_sun_info_001.phpt
Log:
- Fixed bug #39965 (Latitude and longitude are backwards in date_sun_info()).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.642r2=1.2027.2.547.2.643diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.642 php-src/NEWS:1.2027.2.547.2.643
--- php-src/NEWS:1.2027.2.547.2.642 Fri Apr 13 08:10:54 2007
+++ php-src/NEWSFri Apr 13 08:33:48 2007
@@ -10,6 +10,8 @@
units correctly). (Derick)
- Fixed bug #40290 (strtotime() returns unexpected result with particular
timezone offset). (Derick)
+- Fixed bug #39965 (Latitude and longitude are backwards in date_sun_info()).
+ (Derick)
10 Apr 2007, PHP 5.2.2RC1
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.43r2=1.43.2.45.2.44diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.43
php-src/ext/date/php_date.c:1.43.2.45.2.44
--- php-src/ext/date/php_date.c:1.43.2.45.2.43 Mon Mar 5 14:10:18 2007
+++ php-src/ext/date/php_date.c Fri Apr 13 08:33:48 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.43 2007/03/05 14:10:18 mike Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.44 2007/04/13 08:33:48 derick Exp $ */
#include php.h
#include php_streams.h
@@ -2387,7 +2387,7 @@
array_init(return_value);
/* Get sun up/down and transit */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -35.0/60,
1, ddummy, ddummy, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -35.0/60,
1, ddummy, ddummy, rise, set, transit);
switch (rs) {
case -1: /* always below */
add_assoc_bool(return_value, sunrise, 0);
@@ -2407,7 +2407,7 @@
add_assoc_long(return_value, transit, timelib_date_to_int(t2,
dummy));
/* Get civil twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -6.0, 0,
ddummy, ddummy, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -6.0, 0,
ddummy, ddummy, rise, set, transit);
switch (rs) {
case -1: /* always below */
add_assoc_bool(return_value, civil_twilight_begin, 0);
@@ -2425,7 +2425,7 @@
}
/* Get nautical twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -12.0, 0,
ddummy, ddummy, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -12.0, 0,
ddummy, ddummy, rise, set, transit);
switch (rs) {
case -1: /* always below */
add_assoc_bool(return_value, nautical_twilight_begin,
0);
@@ -2443,7 +2443,7 @@
}
/* Get astronomical twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -18.0, 0,
ddummy, ddummy, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -18.0, 0,
ddummy, ddummy, rise, set, transit);
switch (rs) {
case -1: /* always below */
add_assoc_bool(return_value,
astronomical_twilight_begin, 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_sun_info_001.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/date/tests/date_sun_info_001.phpt
diff -u php-src/ext/date/tests/date_sun_info_001.phpt:1.1.2.2
php-src/ext/date/tests/date_sun_info_001.phpt:1.1.2.3
--- php-src/ext/date/tests/date_sun_info_001.phpt:1.1.2.2 Fri Dec 22
13:07:53 2006
+++ php-src/ext/date/tests/date_sun_info_001.phpt Fri Apr 13 08:33:48 2007
@@ -11,22 +11,22 @@
--EXPECTF--
array(9) {
[sunrise]=
- int(1165899133)
+ int(1165897782)
[sunset]=
- int(1165934481)
+ int(1165934168)
[transit]=
- int(1165916807)
+ int(1165915975)
[civil_twilight_begin]=
- int(1165897449)
+ int(1165896176)
[civil_twilight_end]=
- int(1165936165)
+ int(1165935773)
[nautical_twilight_begin]=
- int(1165895547)
+ int(1165894353)
[nautical_twilight_end]=
- int(1165938067)
+ int(1165937597)
[astronomical_twilight_begin]=
- int(1165893693)
+ int(1165892570)
[astronomical_twilight_end]=
- int(1165939921)
+ int(1165939380)
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_sun_info_002.phpt?view=markuprev=1.1
Index: php-src/ext/date/tests/date_sun_info_002.phpt
+++ php-src/ext/date/tests/date_sun_info_002.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/tests date_sun_info_001.phpt
derick Fri Apr 13 08:34:11 2007 UTC
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/tests date_sun_info_001.phpt
Log:
- MFB: Fixed bug #39965 (Latitude and longitude are backwards in
date_sun_info()).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.133r2=1.134diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.133 php-src/ext/date/php_date.c:1.134
--- php-src/ext/date/php_date.c:1.133 Mon Mar 5 14:10:05 2007
+++ php-src/ext/date/php_date.c Fri Apr 13 08:34:11 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.133 2007/03/05 14:10:05 mike Exp $ */
+/* $Id: php_date.c,v 1.134 2007/04/13 08:34:11 derick Exp $ */
#include php.h
#include php_streams.h
@@ -2544,7 +2544,7 @@
array_init(return_value);
/* Get sun up/down and transit */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -35.0/60,
1, ddummy, ddummy, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -35.0/60,
1, ddummy, ddummy, rise, set, transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value, sunrise, 0);
@@ -2564,7 +2564,7 @@
add_ascii_assoc_long(return_value, transit, timelib_date_to_int(t2,
dummy));
/* Get civil twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -6.0, 0,
ddummy, ddummy, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -6.0, 0,
ddummy, ddummy, rise, set, transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value,
civil_twilight_begin, 0);
@@ -2582,7 +2582,7 @@
}
/* Get nautical twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -12.0, 0,
ddummy, ddummy, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -12.0, 0,
ddummy, ddummy, rise, set, transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value,
nautical_twilight_begin, 0);
@@ -2600,7 +2600,7 @@
}
/* Get astronomical twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -18.0, 0,
ddummy, ddummy, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -18.0, 0,
ddummy, ddummy, rise, set, transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value,
astronomical_twilight_begin, 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_sun_info_001.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/date/tests/date_sun_info_001.phpt
diff -u php-src/ext/date/tests/date_sun_info_001.phpt:1.1
php-src/ext/date/tests/date_sun_info_001.phpt:1.2
--- php-src/ext/date/tests/date_sun_info_001.phpt:1.1 Fri Dec 22 13:07:26 2006
+++ php-src/ext/date/tests/date_sun_info_001.phpt Fri Apr 13 08:34:11 2007
@@ -11,22 +11,22 @@
--EXPECTF--
array(9) {
[sunrise]=
- int(1165899133)
+ int(1165897782)
[sunset]=
- int(1165934481)
+ int(1165934168)
[transit]=
- int(1165916807)
+ int(1165915975)
[civil_twilight_begin]=
- int(1165897449)
+ int(1165896176)
[civil_twilight_end]=
- int(1165936165)
+ int(1165935773)
[nautical_twilight_begin]=
- int(1165895547)
+ int(1165894353)
[nautical_twilight_end]=
- int(1165938067)
+ int(1165937597)
[astronomical_twilight_begin]=
- int(1165893693)
+ int(1165892570)
[astronomical_twilight_end]=
- int(1165939921)
+ int(1165939380)
}
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cli/tests 004.phpt 006.phpt
tony2001Fri Apr 13 12:29:32 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cli/tests 004.phpt 006.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/004.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/sapi/cli/tests/004.phpt
diff -u php-src/sapi/cli/tests/004.phpt:1.1.2.5
php-src/sapi/cli/tests/004.phpt:1.1.2.6
--- php-src/sapi/cli/tests/004.phpt:1.1.2.5 Sat Mar 17 19:16:17 2007
+++ php-src/sapi/cli/tests/004.phpt Fri Apr 13 12:29:32 2007
@@ -23,7 +23,7 @@
string(42) Exception: Function echo() does not exist
-string(117) Function [ internal public function phpinfo ] {
+string(110) Function [ internal function phpinfo ] {
- Parameters [1] {
Parameter #0 [ optional $what ]
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/006.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/sapi/cli/tests/006.phpt
diff -u php-src/sapi/cli/tests/006.phpt:1.1.2.5
php-src/sapi/cli/tests/006.phpt:1.1.2.6
--- php-src/sapi/cli/tests/006.phpt:1.1.2.5 Sat Mar 17 19:16:17 2007
+++ php-src/sapi/cli/tests/006.phpt Fri Apr 13 12:29:32 2007
@@ -65,35 +65,35 @@
}
- Functions {
-Function [ internal public function strtotime ] {
+Function [ internal function strtotime ] {
- Parameters [2] {
Parameter #0 [ required $time ]
Parameter #1 [ optional $now ]
}
}
-Function [ internal public function date ] {
+Function [ internal function date ] {
- Parameters [2] {
Parameter #0 [ required $format ]
Parameter #1 [ optional $timestamp ]
}
}
-Function [ internal public function idate ] {
+Function [ internal function idate ] {
- Parameters [2] {
Parameter #0 [ required $format ]
Parameter #1 [ optional $timestamp ]
}
}
-Function [ internal public function gmdate ] {
+Function [ internal function gmdate ] {
- Parameters [2] {
Parameter #0 [ required $format ]
Parameter #1 [ optional $timestamp ]
}
}
-Function [ internal public function mktime ] {
+Function [ internal function mktime ] {
- Parameters [6] {
Parameter #0 [ optional $hour ]
@@ -104,7 +104,7 @@
Parameter #5 [ optional $year ]
}
}
-Function [ internal public function gmmktime ] {
+Function [ internal function gmmktime ] {
- Parameters [6] {
Parameter #0 [ optional $hour ]
@@ -115,7 +115,7 @@
Parameter #5 [ optional $year ]
}
}
-Function [ internal public function checkdate ] {
+Function [ internal function checkdate ] {
- Parameters [3] {
Parameter #0 [ required $month ]
@@ -123,84 +123,84 @@
Parameter #2 [ required $year ]
}
}
-Function [ internal public function strftime ] {
+Function [ internal function strftime ] {
- Parameters [2] {
Parameter #0 [ required $format ]
Parameter #1 [ optional $timestamp ]
}
}
-Function [ internal public function gmstrftime ] {
+Function [ internal function gmstrftime ] {
- Parameters [2] {
Parameter #0 [ required $format ]
Parameter #1 [ optional $timestamp ]
}
}
-Function [ internal public function time ] {
+Function [ internal function time ] {
- Parameters [0] {
}
}
-Function [ internal public function localtime ] {
+Function [ internal function localtime ] {
- Parameters [2] {
Parameter #0 [ optional $timestamp ]
Parameter #1 [ optional $associative_array ]
}
}
-Function [ internal public function getdate ] {
+Function [ internal function getdate ] {
- Parameters [1] {
Parameter #0 [ optional $timestamp ]
}
}
-Function [ internal public function date_create ] {
+Function [ internal function date_create ] {
}
-Function [ internal public function date_parse ] {
+Function [ internal function date_parse ] {
}
-Function [ internal public function date_format ] {
+Function [ internal function date_format ] {
}
-Function [ internal public function date_modify ] {
+Function [ internal function date_modify ] {
}
-Function [ internal public function date_timezone_get ] {
+Function [ internal function date_timezone_get ] {
}
-Function [ internal public function date_timezone_set ] {
+Function [ internal function date_timezone_set ] {
}
-Function [ internal public function date_offset_get ] {
+Function [ internal function date_offset_get ] {
}
-Function [ internal public function date_time_set ] {
+Function [ internal function date_time_set ] {
}
-Function [ internal public function date_date_set ] {
+Function [ internal function date_date_set ] {
}
-Function [ internal public
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/date php_date.c
derick Fri Apr 13 14:09:20 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/date php_date.c Log: - Fixed bug #39416 (Milliseconds in date()). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.643r2=1.2027.2.547.2.644diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.643 php-src/NEWS:1.2027.2.547.2.644 --- php-src/NEWS:1.2027.2.547.2.643 Fri Apr 13 08:33:48 2007 +++ php-src/NEWSFri Apr 13 14:09:20 2007 @@ -12,6 +12,7 @@ timezone offset). (Derick) - Fixed bug #39965 (Latitude and longitude are backwards in date_sun_info()). (Derick) +- Fixed bug #39416 (Milliseconds in date()). (Derick) 10 Apr 2007, PHP 5.2.2RC1 http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.44r2=1.43.2.45.2.45diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.44 php-src/ext/date/php_date.c:1.43.2.45.2.45 --- php-src/ext/date/php_date.c:1.43.2.45.2.44 Fri Apr 13 08:33:48 2007 +++ php-src/ext/date/php_date.c Fri Apr 13 14:09:20 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.45.2.44 2007/04/13 08:33:48 derick Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.45 2007/04/13 14:09:20 derick Exp $ */ #include php.h #include php_streams.h @@ -25,6 +25,7 @@ #include php_ini.h #include ext/standard/info.h #include ext/standard/php_versioning.h +#include ext/standard/php_math.h #include php_date.h #include lib/timelib.h #include time.h @@ -792,6 +793,7 @@ case 'H': length = slprintf(buffer, 32, %02d, (int) t-h); break; case 'i': length = slprintf(buffer, 32, %02d, (int) t-i); break; case 's': length = slprintf(buffer, 32, %02d, (int) t-s); break; + case 'u': length = slprintf(buffer, 32, %06d, (int) floor(t-f * 100)); break; /* timezone */ case 'I': length = slprintf(buffer, 32, %d, localtime ? offset-is_dst : 0); break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
derick Fri Apr 13 14:10:38 2007 UTC Modified files: /php-src/ext/date php_date.c Log: - MFB: Fixed bug #39416 (Milliseconds in date()). http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.134r2=1.135diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.134 php-src/ext/date/php_date.c:1.135 --- php-src/ext/date/php_date.c:1.134 Fri Apr 13 08:34:11 2007 +++ php-src/ext/date/php_date.c Fri Apr 13 14:10:38 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.134 2007/04/13 08:34:11 derick Exp $ */ +/* $Id: php_date.c,v 1.135 2007/04/13 14:10:38 derick Exp $ */ #include php.h #include php_streams.h @@ -25,6 +25,7 @@ #include php_ini.h #include ext/standard/info.h #include ext/standard/php_versioning.h +#include ext/standard/php_math.h #include php_date.h #include lib/timelib.h #include time.h @@ -900,6 +901,7 @@ case 'H': length = date_spprintf(buffer, 32 TSRMLS_CC, %02d, (int) t-h); break; case 'i': length = date_spprintf(buffer, 32 TSRMLS_CC, %02d, (int) t-i); break; case 's': length = date_spprintf(buffer, 32 TSRMLS_CC, %02d, (int) t-s); break; + case 'u': length = date_spprintf(buffer, 32 TSRMLS_CC, %06d, (int) floor(t-f * 100)); break; /* timezone */ case 'I': length = date_spprintf(buffer, 32 TSRMLS_CC, %d, localtime ? offset-is_dst : 0); break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
tony2001Fri Apr 13 14:41:57 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.644r2=1.2027.2.547.2.645diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.644 php-src/NEWS:1.2027.2.547.2.645 --- php-src/NEWS:1.2027.2.547.2.644 Fri Apr 13 14:09:20 2007 +++ php-src/NEWSFri Apr 13 14:41:57 2007 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? Apr 2007, PHP 5.2.2RC2 +- Fixed bug #41075 (memleak when creating default object caused exception). + (Dmitry) - Fixed bug #41063 (chdir doesn't like root paths). (Dmitry) - Fixed bug #41061 (visibility error in ReflectionFunction::export()). (Johannes) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/json JSON_parser.c json.c
andrei Fri Apr 13 21:34:12 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json JSON_parser.c json.c
Log:
Fix processing of control characters; they should be escaped as \u
sequences.
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1.2.4
php-src/ext/json/JSON_parser.c:1.1.2.5
--- php-src/ext/json/JSON_parser.c:1.1.2.4 Tue Jul 25 09:06:55 2006
+++ php-src/ext/json/JSON_parser.c Fri Apr 13 21:34:12 2007
@@ -169,7 +169,7 @@
accepted if the end of the text is in state 9 and mode is MODE_DONE.
*/
static const int state_transition_table[30][31] = {
-/* 0*/ { 0,
0,-8,-1,-6,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+/* 0*/ { 0, 0,-8,-1,-6,-1,-1,-1,
3,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
/* 1*/ { 1, 1,-1,-9,-1,-1,-1,-1,
3,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
/* 2*/ { 2, 2,-8,-1,-6,-5,-1,-1,
3,-1,-1,-1,20,-1,21,22,-1,-1,-1,-1,-1,13,-1,17,-1,-1,10,-1,-1,-1,-1},
/* 3*/ { 3,-1, 3, 3, 3, 3, 3, 3,-4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3},
@@ -577,6 +577,14 @@
case MODE_OBJECT:
the_state = 9;
break;
+ case MODE_DONE:
+ if (type == IS_STRING) {
+ smart_str_0(buf);
+ ZVAL_STRINGL(z, buf.c, buf.len,
1);
+ the_state = 9;
+ break;
+ }
+ /* fall through if not IS_STRING */
default:
FREE_BUFFERS();
return false;
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.13r2=1.9.2.14diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.13 php-src/ext/json/json.c:1.9.2.14
--- php-src/ext/json/json.c:1.9.2.13Thu Apr 12 19:40:38 2007
+++ php-src/ext/json/json.c Fri Apr 13 21:34:12 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.9.2.13 2007/04/12 19:40:38 iliaa Exp $ */
+/* $Id: json.c,v 1.9.2.14 2007/04/13 21:34:12 andrei Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -303,7 +303,7 @@
break;
default:
{
-if (us ' ' || (us 127) == us)
+if (us = ' ' (us 127) == us)
{
smart_str_appendc(buf, (unsigned char) us);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
