[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Oct 16 01:45:58 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2133r2=1.2134ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2133 php-src/ChangeLog:1.2134 --- php-src/ChangeLog:1.2133Sat Oct 15 01:35:32 2005 +++ php-src/ChangeLog Sun Oct 16 01:45:28 2005 @@ -1,3 +1,32 @@ +2005-10-15 Derick Rethans [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + - Fixed timezone guessing on Windows. (Derick, Nuno) + +* NEWS + ZendEngine2/zend_compile.c: + - Changed type hints so that they take = NULL as default value. + +* ext/standard/string.c: + - Fixed folding markers. + +2005-10-15 Georg Richter [EMAIL PROTECTED] + +* (PHP_5_0) + NEWS + ext/mysqli/mysqli_api.c: + Fixed an error in mysqli_fetch_fields (returned NULL instead of an +array when row number field_count). (Georg) + +* (PHP_5_1) + NEWS + ext/mysqli/mysqli_api.c: + fixed an error in mysqli_fetch_fields (function returns NULL instead of + array + when row_number num_fields). + Thanks to Marc Deslisle and phpMyAdmin team for the report. + 2005-10-14 Antony Dovgal [EMAIL PROTECTED] * ZendEngine2/tests/bug34873.phpt @@ -13944,7 +13973,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2133 2005/10/15 05:35:32 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2134 2005/10/16 05:45:28 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -17345,7 +17374,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2133 2005/10/15 05:35:32 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2134 2005/10/16 05:45:28 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -17826,7 +17855,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2133 2005/10/15 05:35:32 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2134 2005/10/16 05:45:28 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -19300,7 +19329,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2133 2005/10/15 05:35:32 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2134 2005/10/16 05:45:28 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Oct 16 01:47:11 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.792r2=1.793ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.792 ZendEngine2/ChangeLog:1.793 --- ZendEngine2/ChangeLog:1.792 Sat Oct 15 01:36:00 2005 +++ ZendEngine2/ChangeLog Sun Oct 16 01:47:08 2005 @@ -1,3 +1,8 @@ +2005-10-15 Derick Rethans [EMAIL PROTECTED] + +* zend_compile.c: + - Changed type hints so that they take = NULL as default value. + 2005-10-14 Antony Dovgal [EMAIL PROTECTED] * tests/bug34873.phpt @@ -10696,7 +10701,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.792 2005/10/15 05:36:00 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.793 2005/10/16 05:47:08 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -12420,7 +12425,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.792 2005/10/15 05:36:00 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.793 2005/10/16 05:47:08 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/mysqli mysqli_api.c
georg Sat Oct 15 02:32:27 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/mysqli mysqli_api.c
Log:
fixed an error in mysqli_fetch_fields (function returns NULL instead of array
when row_number num_fields).
Thanks to Marc Deslisle and phpMyAdmin team for the report.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.128r2=1.2027.2.129ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.128 php-src/NEWS:1.2027.2.129
--- php-src/NEWS:1.2027.2.128 Fri Oct 14 11:30:24 2005
+++ php-src/NEWSSat Oct 15 02:32:21 2005
@@ -34,6 +34,8 @@
- Added new_link parameter to mssql_connect() (Bug #34369). (Frank)
- Added missing safe_mode checks for image* functions and cURL. (Ilia)
- Added missing safe_mode/open_basedir checks for file uploads. (Ilia)
+- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
+ array when row number field_count). (Georg)
- Fixed possible INI setting leak via virtual() in Apache 2 sapi. (Ilia)
- Fixed potential GLOBALS overwrite via import_request_variables() and
possible crash and/or memory corruption. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.4r2=1.118.2.5ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.4
php-src/ext/mysqli/mysqli_api.c:1.118.2.5
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.4 Mon Oct 10 16:06:34 2005
+++ php-src/ext/mysqli/mysqli_api.c Sat Oct 15 02:32:26 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.118.2.4 2005/10/10 20:06:34 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.118.2.5 2005/10/15 06:32:26 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -740,10 +740,6 @@
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result,
mysqli_result);
- if (!(field = mysql_fetch_field(result))) {
- RETURN_FALSE;
- }
-
array_init(return_value);
for (i = 0; i mysql_num_fields(result); i++) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/mysqli mysqli_api.c
georg Sat Oct 15 03:33:14 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mysqli mysqli_api.c
Log:
Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.500r2=1.1760.2.501ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.500 php-src/NEWS:1.1760.2.501
--- php-src/NEWS:1.1760.2.500 Thu Oct 13 11:24:25 2005
+++ php-src/NEWSSat Oct 15 03:33:01 2005
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? , PHP 5.0.6
+- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
+ array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
- Fixed bug #34856 (configure fails to detect libiconv's type). (Tony)
- Fixed bug #34855 (ibase_service_attach() segfault on AMD64).
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.87.2.24r2=1.87.2.25ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.87.2.24
php-src/ext/mysqli/mysqli_api.c:1.87.2.25
--- php-src/ext/mysqli/mysqli_api.c:1.87.2.24 Mon Oct 10 08:59:06 2005
+++ php-src/ext/mysqli/mysqli_api.c Sat Oct 15 03:33:12 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.87.2.24 2005/10/10 12:59:06 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.87.2.25 2005/10/15 07:33:12 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -742,10 +742,6 @@
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result,
mysqli_result);
- if (!(field = mysql_fetch_field(result))) {
- RETURN_FALSE;
- }
-
array_init(return_value);
for (i = 0; i mysql_num_fields(result); i++) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
derick Sat Oct 15 08:50:22 2005 EDT
Modified files:
/php-src/ext/standard string.c
Log:
- Fixed folding markers.
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.494r2=1.495ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.494 php-src/ext/standard/string.c:1.495
--- php-src/ext/standard/string.c:1.494 Wed Oct 12 07:00:47 2005
+++ php-src/ext/standard/string.c Sat Oct 15 08:50:20 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.494 2005/10/12 11:00:47 dmitry Exp $ */
+/* $Id: string.c,v 1.495 2005/10/15 12:50:20 derick Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3950,6 +3950,7 @@
{
return php_u_addslashes_ex(str, length, new_length, should_free, 0
TSRMLS_CC);
}
+/* }}} */
/* {{{ php_u_addslashes_ex
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/date php_date.c /ext/date/lib fallbackmap.h
derick Sat Oct 15 14:12:31 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/date php_date.c
/php-src/ext/date/lib fallbackmap.h
Log:
- Fixed timezone guessing on Windows. (Derick, Nuno)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.129r2=1.2027.2.130ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.129 php-src/NEWS:1.2027.2.130
--- php-src/NEWS:1.2027.2.129 Sat Oct 15 02:32:21 2005
+++ php-src/NEWSSat Oct 15 14:12:27 2005
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? Oct 2005, PHP 5.1 Release Candidate 3
+- Updated timezone database to version 2005.14. (Derick)
+- Fixed timezone guessing on Windows. (Derick, Nuno)
14 Oct 2005, PHP 5.1 Release Candidate 2
- Changed SQLite extension to be a shared module in Windows distribution.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.16r2=1.43.2.17ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.16
php-src/ext/date/php_date.c:1.43.2.17
--- php-src/ext/date/php_date.c:1.43.2.16 Wed Oct 12 15:49:59 2005
+++ php-src/ext/date/php_date.c Sat Oct 15 14:12:29 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.16 2005/10/12 19:49:59 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.17 2005/10/15 18:12:29 derick Exp $ */
#include php.h
#include php_streams.h
@@ -337,26 +337,29 @@
switch (GetTimeZoneInformation(tzi))
{
+ /* no DST or not in effect */
case TIME_ZONE_ID_UNKNOWN:
- /* we have no clue what it is, return UTC */
- php_error_docref(NULL TSRMLS_CC, E_STRICT, It
is not safe to rely on the systems timezone settings, please use the
date.timezone setting, the TZ environment variable or the
date_default_timezone_set() function. We use 'UTC' instead.);
- tzid = UTC;
- break;
-
case TIME_ZONE_ID_STANDARD:
+php_win_std_time:
tzid = timelib_timezone_id_from_abbr(,
(tzi.Bias + tzi.StandardBias) * -60, 0);
if (! tzid) {
tzid = UTC;
}
- php_error_docref(NULL TSRMLS_CC, E_STRICT, It
is not safe to rely on the systems timezone settings, please use the
date.timezone setting, the TZ environment variable or the
date_default_timezone_set() function. We use '%s' for '%.1f/no DST' instead.,
tzid, (float) ((tzi.Bias + tzi.StandardBias) / -60));
+ php_error_docref(NULL TSRMLS_CC, E_STRICT, It
is not safe to rely on the systems timezone settings, please use the
date.timezone setting, the TZ environment variable or the
date_default_timezone_set() function. We use '%s' for '%.1f/no DST' instead.,
tzid, ((tzi.Bias + tzi.StandardBias) / -60.0));
break;
+ /* DST in effect */
case TIME_ZONE_ID_DAYLIGHT:
+ /* If user has disabled DST in the control
panel, Windows returns 0 here */
+ if (tzi.DaylightBias == 0) {
+ goto php_win_std_time;
+ }
+
tzid = timelib_timezone_id_from_abbr(,
(tzi.Bias + tzi.DaylightBias) * -60, 1);
if (! tzid) {
tzid = UTC;
}
- php_error_docref(NULL TSRMLS_CC, E_STRICT, It
is not safe to rely on the systems timezone settings, please use the
date.timezone setting, the TZ environment variable or the
date_default_timezone_set() function. We use '%s' for '%.1f/DST' instead.,
tzid, (float) ((tzi.Bias + tzi.DaylightBias) / -60));
+ php_error_docref(NULL TSRMLS_CC, E_STRICT, It
is not safe to rely on the systems timezone settings, please use the
date.timezone setting, the TZ environment variable or the
date_default_timezone_set() function. We use '%s' for '%.1f/DST' instead.,
tzid, ((tzi.Bias + tzi.DaylightBias) / -60.0));
break;
}
return tzid;
http://cvs.php.net/diff.php/php-src/ext/date/lib/fallbackmap.h?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/ext/date/lib/fallbackmap.h
diff -u php-src/ext/date/lib/fallbackmap.h:1.1.2.1
php-src/ext/date/lib/fallbackmap.h:1.1.2.2
--- php-src/ext/date/lib/fallbackmap.h:1.1.2.1 Sat Oct 1 11:04:03 2005
+++ php-src/ext/date/lib/fallbackmap.h
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date/lib timezonedb.h
derick Sat Oct 15 14:13:23 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/date/lib timezonedb.h
Log:
- Updated timezone database to version 2005.14.
http://cvs.php.net/diff.php/php-src/ext/date/lib/timezonedb.h?r1=1.4.2.3r2=1.4.2.4ty=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.4.2.3
php-src/ext/date/lib/timezonedb.h:1.4.2.4
--- php-src/ext/date/lib/timezonedb.h:1.4.2.3 Mon Oct 3 07:17:24 2005
+++ php-src/ext/date/lib/timezonedb.h Sat Oct 15 14:13:19 2005
@@ -145,398 +145,398 @@
{ America/Miquelon , 0x00C895 },
{ America/Monterrey , 0x00CAFB },
{ America/Montevideo, 0x00CCFE },
- { America/Montreal , 0x00CEBA },
- { America/Montserrat, 0x00D39E },
- { America/Nassau, 0x00D3E7 },
- { America/New_York , 0x00D720 },
- { America/Nipigon , 0x00DC13 },
- { America/Nome , 0x00DF0D },
- { America/Noronha , 0x00E266 },
- { America/North_Dakota/Center , 0x00E37A },
- { America/Panama, 0x00E6D7 },
- { America/Pangnirtung , 0x00E720 },
- { America/Paramaribo, 0x00EA2A },
- { America/Phoenix , 0x00EAB0 },
- { America/Port-au-Prince, 0x00EB32 },
- { America/Port_of_Spain , 0x00ED1A },
- { America/Porto_Acre, 0x00EC38 },
- { America/Porto_Velho , 0x00ED63 },
- { America/Puerto_Rico , 0x00EE45 },
- { America/Rainy_River , 0x00EE93 },
- { America/Rankin_Inlet , 0x00F18D },
- { America/Recife, 0x00F473 },
- { America/Regina, 0x00F587 },
- { America/Rio_Branco, 0x00F704 },
- { America/Rosario , 0x00F7E6 },
- { America/Santiago , 0x00F96C },
- { America/Santo_Domingo , 0x00FCE6 },
- { America/Sao_Paulo , 0x00FDA0 },
- { America/Scoresbysund , 0x010071 },
- { America/Shiprock , 0x010334 },
- { America/St_Johns , 0x0106A1 },
- { America/St_Kitts , 0x010BC0 },
- { America/St_Lucia , 0x010C09 },
- { America/St_Thomas , 0x010C52 },
- { America/St_Vincent, 0x010C9B },
- { America/Swift_Current , 0x010CE4 },
- { America/Tegucigalpa , 0x010DCB },
- { America/Thule , 0x010E34 },
- { America/Thunder_Bay , 0x01105F },
- { America/Tijuana , 0x011379 },
- { America/Toronto , 0x0116C5 },
- { America/Tortola , 0x011BA9 },
- { America/Vancouver , 0x011BF2 },
- { America/Virgin, 0x011FFF },
- { America/Whitehorse, 0x012048 },
- { America/Winnipeg , 0x01233F },
- { America/Yakutat , 0x012740 },
- { America/Yellowknife , 0x012A7C },
- { Antarctica/Casey , 0x012D56 },
- { Antarctica/Davis , 0x012D9F },
- { Antarctica/DumontDUrville , 0x012DF3 },
- { Antarctica/Mawson , 0x012E53 },
- { Antarctica/McMurdo, 0x012E9D },
- { Antarctica/Palmer , 0x013177 },
- { Antarctica/Rothera, 0x013480 },
- { Antarctica/South_Pole , 0x0134CA },
- { Antarctica/Syowa , 0x0137A4 },
- { Antarctica/Vostok , 0x0137EE },
- { Arctic/Longyearbyen , 0x013838 },
- { Asia/Aden , 0x013B5E },
- { Asia/Almaty , 0x013BA7 },
- { Asia/Amman, 0x013D0C },
- { Asia/Anadyr , 0x013FC0 },
- { Asia/Aqtau, 0x01428C },
- { Asia/Aqtobe , 0x01444E },
- { Asia/Ashgabat , 0x0145EB },
- { Asia/Ashkhabad, 0x0146FC },
- { Asia/Baghdad , 0x01480D },
- { Asia/Bahrain , 0x014AA2 },
- { Asia/Baku , 0x014AFC },
- { Asia/Bangkok , 0x014DDD },
- { Asia/Beirut , 0x014E26 },
- { Asia/Bishkek , 0x015127 },
- { Asia/Brunei , 0x0153FF },
- { Asia/Calcutta , 0x015455 },
-
[PHP-CVS] cvs: php-src /ext/date/lib timezonedb.h
derick Sat Oct 15 14:14:13 2005 EDT
Modified files:
/php-src/ext/date/lib timezonedb.h
Log:
- MF51: Updated timezone database to version 2005.14.
http://cvs.php.net/diff.php/php-src/ext/date/lib/timezonedb.h?r1=1.7r2=1.8ty=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.7
php-src/ext/date/lib/timezonedb.h:1.8
--- php-src/ext/date/lib/timezonedb.h:1.7 Mon Oct 3 07:15:20 2005
+++ php-src/ext/date/lib/timezonedb.h Sat Oct 15 14:14:11 2005
@@ -145,398 +145,398 @@
{ America/Miquelon , 0x00C895 },
{ America/Monterrey , 0x00CAFB },
{ America/Montevideo, 0x00CCFE },
- { America/Montreal , 0x00CEBA },
- { America/Montserrat, 0x00D39E },
- { America/Nassau, 0x00D3E7 },
- { America/New_York , 0x00D720 },
- { America/Nipigon , 0x00DC13 },
- { America/Nome , 0x00DF0D },
- { America/Noronha , 0x00E266 },
- { America/North_Dakota/Center , 0x00E37A },
- { America/Panama, 0x00E6D7 },
- { America/Pangnirtung , 0x00E720 },
- { America/Paramaribo, 0x00EA2A },
- { America/Phoenix , 0x00EAB0 },
- { America/Port-au-Prince, 0x00EB32 },
- { America/Port_of_Spain , 0x00ED1A },
- { America/Porto_Acre, 0x00EC38 },
- { America/Porto_Velho , 0x00ED63 },
- { America/Puerto_Rico , 0x00EE45 },
- { America/Rainy_River , 0x00EE93 },
- { America/Rankin_Inlet , 0x00F18D },
- { America/Recife, 0x00F473 },
- { America/Regina, 0x00F587 },
- { America/Rio_Branco, 0x00F704 },
- { America/Rosario , 0x00F7E6 },
- { America/Santiago , 0x00F96C },
- { America/Santo_Domingo , 0x00FCE6 },
- { America/Sao_Paulo , 0x00FDA0 },
- { America/Scoresbysund , 0x010071 },
- { America/Shiprock , 0x010334 },
- { America/St_Johns , 0x0106A1 },
- { America/St_Kitts , 0x010BC0 },
- { America/St_Lucia , 0x010C09 },
- { America/St_Thomas , 0x010C52 },
- { America/St_Vincent, 0x010C9B },
- { America/Swift_Current , 0x010CE4 },
- { America/Tegucigalpa , 0x010DCB },
- { America/Thule , 0x010E34 },
- { America/Thunder_Bay , 0x01105F },
- { America/Tijuana , 0x011379 },
- { America/Toronto , 0x0116C5 },
- { America/Tortola , 0x011BA9 },
- { America/Vancouver , 0x011BF2 },
- { America/Virgin, 0x011FFF },
- { America/Whitehorse, 0x012048 },
- { America/Winnipeg , 0x01233F },
- { America/Yakutat , 0x012740 },
- { America/Yellowknife , 0x012A7C },
- { Antarctica/Casey , 0x012D56 },
- { Antarctica/Davis , 0x012D9F },
- { Antarctica/DumontDUrville , 0x012DF3 },
- { Antarctica/Mawson , 0x012E53 },
- { Antarctica/McMurdo, 0x012E9D },
- { Antarctica/Palmer , 0x013177 },
- { Antarctica/Rothera, 0x013480 },
- { Antarctica/South_Pole , 0x0134CA },
- { Antarctica/Syowa , 0x0137A4 },
- { Antarctica/Vostok , 0x0137EE },
- { Arctic/Longyearbyen , 0x013838 },
- { Asia/Aden , 0x013B5E },
- { Asia/Almaty , 0x013BA7 },
- { Asia/Amman, 0x013D0C },
- { Asia/Anadyr , 0x013FC0 },
- { Asia/Aqtau, 0x01428C },
- { Asia/Aqtobe , 0x01444E },
- { Asia/Ashgabat , 0x0145EB },
- { Asia/Ashkhabad, 0x0146FC },
- { Asia/Baghdad , 0x01480D },
- { Asia/Bahrain , 0x014AA2 },
- { Asia/Baku , 0x014AFC },
- { Asia/Bangkok , 0x014DDD },
- { Asia/Beirut , 0x014E26 },
- { Asia/Bishkek , 0x015127 },
- { Asia/Brunei , 0x0153FF },
- { Asia/Calcutta , 0x015455 },
- { Asia/Choibalsan
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/lib fallbackmap.h
derick Sat Oct 15 14:14:40 2005 EDT
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/lib fallbackmap.h
Log:
- MF51: Fixed timezone guessing on Windows.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.62r2=1.63ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.62 php-src/ext/date/php_date.c:1.63
--- php-src/ext/date/php_date.c:1.62Wed Oct 12 15:49:35 2005
+++ php-src/ext/date/php_date.c Sat Oct 15 14:14:40 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.62 2005/10/12 19:49:35 derick Exp $ */
+/* $Id: php_date.c,v 1.63 2005/10/15 18:14:40 derick Exp $ */
#include php.h
#include php_streams.h
@@ -339,26 +339,29 @@
switch (GetTimeZoneInformation(tzi))
{
+ /* no DST or not in effect */
case TIME_ZONE_ID_UNKNOWN:
- /* we have no clue what it is, return UTC */
- php_error_docref(NULL TSRMLS_CC, E_STRICT, It
is not safe to rely on the systems timezone settings, please use the
date.timezone setting, the TZ environment variable or the
date_default_timezone_set() function. We use 'UTC' instead.);
- tzid = UTC;
- break;
-
case TIME_ZONE_ID_STANDARD:
+php_win_std_time:
tzid = timelib_timezone_id_from_abbr(,
(tzi.Bias + tzi.StandardBias) * -60, 0);
if (! tzid) {
tzid = UTC;
}
- php_error_docref(NULL TSRMLS_CC, E_STRICT, It
is not safe to rely on the systems timezone settings, please use the
date.timezone setting, the TZ environment variable or the
date_default_timezone_set() function. We use '%s' for '%.1f/no DST' instead.,
tzid, (float) ((tzi.Bias + tzi.StandardBias) / -60));
+ php_error_docref(NULL TSRMLS_CC, E_STRICT, It
is not safe to rely on the systems timezone settings, please use the
date.timezone setting, the TZ environment variable or the
date_default_timezone_set() function. We use '%s' for '%.1f/no DST' instead.,
tzid, ((tzi.Bias + tzi.StandardBias) / -60.0));
break;
+ /* DST in effect */
case TIME_ZONE_ID_DAYLIGHT:
+ /* If user has disabled DST in the control
panel, Windows returns 0 here */
+ if (tzi.DaylightBias == 0) {
+ goto php_win_std_time;
+ }
+
tzid = timelib_timezone_id_from_abbr(,
(tzi.Bias + tzi.DaylightBias) * -60, 1);
if (! tzid) {
tzid = UTC;
}
- php_error_docref(NULL TSRMLS_CC, E_STRICT, It
is not safe to rely on the systems timezone settings, please use the
date.timezone setting, the TZ environment variable or the
date_default_timezone_set() function. We use '%s' for '%.1f/DST' instead.,
tzid, (float) ((tzi.Bias + tzi.DaylightBias) / -60));
+ php_error_docref(NULL TSRMLS_CC, E_STRICT, It
is not safe to rely on the systems timezone settings, please use the
date.timezone setting, the TZ environment variable or the
date_default_timezone_set() function. We use '%s' for '%.1f/DST' instead.,
tzid, ((tzi.Bias + tzi.DaylightBias) / -60.0));
break;
}
return tzid;
http://cvs.php.net/diff.php/php-src/ext/date/lib/fallbackmap.h?r1=1.2r2=1.3ty=u
Index: php-src/ext/date/lib/fallbackmap.h
diff -u php-src/ext/date/lib/fallbackmap.h:1.2
php-src/ext/date/lib/fallbackmap.h:1.3
--- php-src/ext/date/lib/fallbackmap.h:1.2 Sat Oct 1 11:07:20 2005
+++ php-src/ext/date/lib/fallbackmap.h Sat Oct 15 14:14:40 2005
@@ -1,3 +1,4 @@
+ { sst, 0, -11, Pacific/Apia },
{ hst, 0, -10, Pacific/Honolulu },
{ akst, 0, -9, America/Anchorage },
{ akdt, 1, -8, America/Anchorage },
@@ -10,7 +11,11 @@
{ est, 0, -5, America/New_York },
{ edt, 1, -4, America/New_York },
{ ast, 0, -4, America/Halifax },
- { adt, 0, -3, America/Halifax },
+ { adt, 1, -3, America/Halifax },
+ { brt, 0, -3, America/Sao_Paulo },
+ { brst, 1, -2, America/Sao_Paulo },
+ { azost, 0, -1, Atlantic/Azores },
+ { azodt, 1,0, Atlantic/Azores },
{ gmt, 0,0, Europe/London },
{ bst, 1,1, Europe/London },
{ cet, 0,1, Europe/Paris },
@@ -23,6 +28,7 @@
