[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Nov 27 01:47:50 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2176r2=1.2177ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2176 php-src/ChangeLog:1.2177 --- php-src/ChangeLog:1.2176Sat Nov 26 01:37:35 2005 +++ php-src/ChangeLog Sun Nov 27 01:47:40 2005 @@ -1,3 +1,81 @@ +2005-11-26 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + Bug fixing news + +* (PHP_5_1) + ZendEngine2/zend.h: + No longer dev + +2005-11-26 Marcus Boerger [EMAIL PROTECTED] + +* run-tests.php: + - Output modularization, 1st step + +2005-11-26 Antony Dovgal [EMAIL PROTECTED] + +* ext/oci8/oci8.c: + show OIC version in phpinfo(); if possible + fix build with older versions: SQLT_BDOUBLE SQLT_BFLOAT first appeared + in Oracle 10 + +2005-11-26 Marcus Boerger [EMAIL PROTECTED] + +* tests/lang/bug35382.phpt: + - Really test the issue here + +* run-tests.php: + - Bug 35382 was nit fixed but the test system was not capable for this kind +of tests + +2005-11-26 Jani Taskinen [EMAIL PROTECTED] + +* tests/lang/bug35382.phpt + tests/lang/bug35382.phpt: + fix test + +2005-11-26 Marcus Boerger [EMAIL PROTECTED] + +* tests/lang/bug35382.phpt: + - Scew short open tags + +* tests/lang/bug35382.phpt + tests/lang/bug35382.phpt: + + - Add new test + +* (PHP_5_1) + NEWS: + - BFN + +* (PHP_5_1) + ZendEngine2/zend_language_scanner.l: + - MFH Fix bug #35406 eval hangs when evall'ed code ends with comment w/o + newline + +* ZendEngine2/zend_language_scanner.l: + - Fix bug #35406 eval hangs when evall'ed code ends with comment w/o + newline + +* CODING_STANDARDS: + - Oversight + +* CODING_STANDARDS: + - Synch with what we decided for 5 and what we are practicing since 5 + +2005-11-26 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + MFH: fix #35402 (New date class causes crash in get_object_vars()) + +2005-11-26 Rasmus Lerdorf [EMAIL PROTECTED] + +* (PHP_5_1) + ZendEngine2/zend_vm_gen.php: + Typo + 2005-11-25 Rui Hirokawa [EMAIL PROTECTED] * (PHP_5_0) @@ -17317,7 +17395,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2176 2005/11/26 06:37:35 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2177 2005/11/27 06:47:40 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -20718,7 +20796,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2176 2005/11/26 06:37:35 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2177 2005/11/27 06:47:40 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -21199,7 +21277,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2176 2005/11/26 06:37:35 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2177 2005/11/27 06:47:40 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -22673,7 +22751,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2176 2005/11/26 06:37:35 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2177 2005/11/27 06:47:40 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Nov 27 01:48:57 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.816r2=1.817ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.816 ZendEngine2/ChangeLog:1.817 --- ZendEngine2/ChangeLog:1.816 Sat Nov 26 01:37:54 2005 +++ ZendEngine2/ChangeLog Sun Nov 27 01:48:53 2005 @@ -1,3 +1,26 @@ +2005-11-26 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_1) + zend.h: + No longer dev + +2005-11-26 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + zend_language_scanner.l: + - MFH Fix bug #35406 eval hangs when evall'ed code ends with comment w/o + newline + +* zend_language_scanner.l: + - Fix bug #35406 eval hangs when evall'ed code ends with comment w/o + newline + +2005-11-26 Rasmus Lerdorf [EMAIL PROTECTED] + +* (PHP_5_1) + zend_vm_gen.php: + Typo + 2005-11-25 Antony Dovgal [EMAIL PROTECTED] * zend.h: @@ -11220,7 +11243,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.816 2005/11/26 06:37:54 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.817 2005/11/27 06:48:53 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -12944,7 +12967,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.816 2005/11/26 06:37:54 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.817 2005/11/27 06:48:53 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/date php_date.c
tony2001Sat Nov 26 04:39:53 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
fix #35402 (New date class causes crash in get_object_vars())
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.68r2=1.69ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.68 php-src/ext/date/php_date.c:1.69
--- php-src/ext/date/php_date.c:1.68Sun Nov 20 15:31:48 2005
+++ php-src/ext/date/php_date.c Sat Nov 26 04:39:50 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.68 2005/11/20 20:31:48 derick Exp $ */
+/* $Id: php_date.c,v 1.69 2005/11/26 09:39:50 tony2001 Exp $ */
#include php.h
#include php_streams.h
@@ -1152,11 +1152,16 @@
{
php_date_obj *intern;
zend_object_value retval;
+ zval *tmp;
intern = emalloc(sizeof(php_date_obj));
memset(intern, 0, sizeof(php_date_obj));
intern-std.ce = class_type;
-
+
+ ALLOC_HASHTABLE(intern-std.properties);
+ zend_hash_init(intern-std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(intern-std.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
+
retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t) date_object_free_storage_date, NULL
TSRMLS_CC);
retval.handlers = date_object_handlers_date;
@@ -1189,6 +1194,12 @@
timelib_time_dtor(intern-time);
}
+ if (intern-std.properties) {
+ zend_hash_destroy(intern-std.properties);
+ efree(intern-std.properties);
+ intern-std.properties = NULL;
+ }
+
efree(object);
}
--
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
tony2001Sat Nov 26 04:40:55 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/date php_date.c
Log:
MFH: fix #35402 (New date class causes crash in get_object_vars())
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.224r2=1.2027.2.225ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.224 php-src/NEWS:1.2027.2.225
--- php-src/NEWS:1.2027.2.224 Fri Nov 25 07:55:54 2005
+++ php-src/NEWSSat Nov 26 04:40:50 2005
@@ -5,6 +5,7 @@
- Added an additional field $frame['object'] to the result array of
debug_backtrace() that contains a reference to the respective object when the
frame was called from an object. (Sebastian)
+- Fixed bug #35402 (New date class causes crash in get_object_vars()). (Tony)
- Fixed bug #35391 (pdo_mysql::exec does not return number of affected rows).
(Tony)
- Fixed bug #35360 (exceptions in interactive mode (php -a) may cause crash).
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.22r2=1.43.2.23ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.22
php-src/ext/date/php_date.c:1.43.2.23
--- php-src/ext/date/php_date.c:1.43.2.22 Sun Nov 20 15:14:23 2005
+++ php-src/ext/date/php_date.c Sat Nov 26 04:40:54 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.22 2005/11/20 20:14:23 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.23 2005/11/26 09:40:54 tony2001 Exp $ */
#include php.h
#include php_streams.h
@@ -1038,11 +1038,16 @@
{
php_date_obj *intern;
zend_object_value retval;
+ zval *tmp;
intern = emalloc(sizeof(php_date_obj));
memset(intern, 0, sizeof(php_date_obj));
intern-std.ce = class_type;
-
+
+ ALLOC_HASHTABLE(intern-std.properties);
+ zend_hash_init(intern-std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(intern-std.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
+
retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t) date_object_free_storage_date, NULL
TSRMLS_CC);
retval.handlers = date_object_handlers_date;
@@ -1075,6 +1080,12 @@
timelib_time_dtor(intern-time);
}
+ if (intern-std.properties) {
+ zend_hash_destroy(intern-std.properties);
+ efree(intern-std.properties);
+ intern-std.properties = NULL;
+ }
+
efree(object);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / CODING_STANDARDS
helly Sat Nov 26 07:25:59 2005 EDT Modified files: /php-srcCODING_STANDARDS Log: - Synch with what we decided for 5 and what we are practicing since 5 http://cvs.php.net/diff.php/php-src/CODING_STANDARDS?r1=1.32r2=1.33ty=u Index: php-src/CODING_STANDARDS diff -u php-src/CODING_STANDARDS:1.32 php-src/CODING_STANDARDS:1.33 --- php-src/CODING_STANDARDS:1.32 Fri Jan 30 05:15:24 2004 +++ php-src/CODING_STANDARDSSat Nov 26 07:25:58 2005 @@ -148,21 +148,21 @@ 'buildsomewidget' 'getI()' -[7] Classes should be given descriptive names. Avoid using abbreviations -where possible. Each word in the class name should start with a capital -letter, with words underscore delimited. The class name should be prefixed -with the name of the 'parent set'. +[7] Classes should be given descriptive names. Avoid using abbreviations where +possible. Each word in the class name should start with a capital letter, +without underscore delimiters (CampelCaps starting with a capital letter). +The class name should be prefixed with the name of the 'parent set' (e.g. +the name of the extension). Good: 'Curl' -'Foo_Bar' +'FooBar' Bad: 'foobar' 'foo_bar' 'FooBar' - - + Syntax and indentation -- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / CODING_STANDARDS
helly Sat Nov 26 07:33:43 2005 EDT Modified files: /php-srcCODING_STANDARDS Log: - Oversight http://cvs.php.net/diff.php/php-src/CODING_STANDARDS?r1=1.33r2=1.34ty=u Index: php-src/CODING_STANDARDS diff -u php-src/CODING_STANDARDS:1.33 php-src/CODING_STANDARDS:1.34 --- php-src/CODING_STANDARDS:1.33 Sat Nov 26 07:25:58 2005 +++ php-src/CODING_STANDARDSSat Nov 26 07:33:42 2005 @@ -161,7 +161,6 @@ Bad: 'foobar' 'foo_bar' -'FooBar' Syntax and indentation -- -- 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) /ext/date php_date.c
tony2001Sat Nov 26 07:35:28 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/date php_date.c
Log:
fix Timezone class too
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.23r2=1.43.2.24ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.23
php-src/ext/date/php_date.c:1.43.2.24
--- php-src/ext/date/php_date.c:1.43.2.23 Sat Nov 26 04:40:54 2005
+++ php-src/ext/date/php_date.c Sat Nov 26 07:35:27 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.23 2005/11/26 09:40:54 tony2001 Exp $ */
+/* $Id: php_date.c,v 1.43.2.24 2005/11/26 12:35:27 tony2001 Exp $ */
#include php.h
#include php_streams.h
@@ -1058,11 +1058,16 @@
{
php_timezone_obj *intern;
zend_object_value retval;
+ zval *tmp;
intern = emalloc(sizeof(php_timezone_obj));
memset(intern, 0, sizeof(php_timezone_obj));
intern-std.ce = class_type;
+ ALLOC_HASHTABLE(intern-std.properties);
+ zend_hash_init(intern-std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(intern-std.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
+
retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t) date_object_free_storage_timezone, NULL
TSRMLS_CC);
retval.handlers = date_object_handlers_timezone;
@@ -1091,6 +1096,14 @@
static void date_object_free_storage_timezone(void *object TSRMLS_DC)
{
+ php_date_obj *intern = (php_date_obj *)object;
+
+ if (intern-std.properties) {
+ zend_hash_destroy(intern-std.properties);
+ efree(intern-std.properties);
+ intern-std.properties = NULL;
+ }
+
efree(object);
}
--
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
tony2001Sat Nov 26 07:37:20 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
MF51: add properties hashtable to Timezone class
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.69r2=1.70ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.69 php-src/ext/date/php_date.c:1.70
--- php-src/ext/date/php_date.c:1.69Sat Nov 26 04:39:50 2005
+++ php-src/ext/date/php_date.c Sat Nov 26 07:37:20 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.69 2005/11/26 09:39:50 tony2001 Exp $ */
+/* $Id: php_date.c,v 1.70 2005/11/26 12:37:20 tony2001 Exp $ */
#include php.h
#include php_streams.h
@@ -1172,11 +1172,16 @@
{
php_timezone_obj *intern;
zend_object_value retval;
+ zval *tmp;
intern = emalloc(sizeof(php_timezone_obj));
memset(intern, 0, sizeof(php_timezone_obj));
intern-std.ce = class_type;
+ ALLOC_HASHTABLE(intern-std.properties);
+ zend_hash_init(intern-std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(intern-std.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
+
retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t) date_object_free_storage_timezone, NULL
TSRMLS_CC);
retval.handlers = date_object_handlers_timezone;
@@ -1205,6 +1210,14 @@
static void date_object_free_storage_timezone(void *object TSRMLS_DC)
{
+ php_timezone_obj *intern = (php_timezone_obj *)object;
+
+ if (intern-std.properties) {
+ zend_hash_destroy(intern-std.properties);
+ efree(intern-std.properties);
+ intern-std.properties = NULL;
+ }
+
efree(object);
}
--
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
helly Sat Nov 26 08:12:53 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.225r2=1.2027.2.226ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.225 php-src/NEWS:1.2027.2.226 --- php-src/NEWS:1.2027.2.225 Sat Nov 26 04:40:50 2005 +++ php-src/NEWSSat Nov 26 08:12:52 2005 @@ -5,6 +5,8 @@ - Added an additional field $frame['object'] to the result array of debug_backtrace() that contains a reference to the respective object when the frame was called from an object. (Sebastian) +- Fixed bug #35406 (eval hangs when evall'ed code ends with comment w/o + newline). (Marcus) - Fixed bug #35402 (New date class causes crash in get_object_vars()). (Tony) - Fixed bug #35391 (pdo_mysql::exec does not return number of affected rows). (Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug35382.phpt
helly Sat Nov 26 08:22:47 2005 EDT Added files: /php-src/tests/lang bug35382.phpt Log: - Add new test http://cvs.php.net/co.php/php-src/tests/lang/bug35382.phpt?r=1.1p=1 Index: php-src/tests/lang/bug35382.phpt +++ php-src/tests/lang/bug35382.phpt --TEST-- Bug #35382 (Comment in end of file produces fatal error) --FILE-- ? eval(echo 'Hello'; // comment); echo World; //last line comment --EXPECTF-- Hello World -- 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) /tests/lang bug35382.phpt
helly Sat Nov 26 08:23:27 2005 EDT Added files: (Branch: PHP_5_1) /php-src/tests/lang bug35382.phpt Log: - MFH Add new test http://cvs.php.net/co.php/php-src/tests/lang/bug35382.phpt?r=1.1p=1 Index: php-src/tests/lang/bug35382.phpt +++ php-src/tests/lang/bug35382.phpt --TEST-- Bug #35382 (Comment in end of file produces fatal error) --FILE-- ? eval(echo 'Hello'; // comment); echo World; //last line comment --EXPECTF-- Hello World -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug35382.phpt
helly Sat Nov 26 08:37:32 2005 EDT Modified files: /php-src/tests/lang bug35382.phpt Log: - Scew short open tags http://cvs.php.net/diff.php/php-src/tests/lang/bug35382.phpt?r1=1.1r2=1.2ty=u Index: php-src/tests/lang/bug35382.phpt diff -u php-src/tests/lang/bug35382.phpt:1.1 php-src/tests/lang/bug35382.phpt:1.2 --- php-src/tests/lang/bug35382.phpt:1.1Sat Nov 26 08:22:46 2005 +++ php-src/tests/lang/bug35382.phptSat Nov 26 08:37:30 2005 @@ -1,7 +1,7 @@ --TEST-- Bug #35382 (Comment in end of file produces fatal error) --FILE-- -? +?php eval(echo 'Hello'; // comment); echo World; //last line comment -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug35382.phpt
sniper Sat Nov 26 08:39:55 2005 EDT Modified files: /php-src/tests/lang bug35382.phpt Log: fix test http://cvs.php.net/diff.php/php-src/tests/lang/bug35382.phpt?r1=1.2r2=1.3ty=u Index: php-src/tests/lang/bug35382.phpt diff -u php-src/tests/lang/bug35382.phpt:1.2 php-src/tests/lang/bug35382.phpt:1.3 --- php-src/tests/lang/bug35382.phpt:1.2Sat Nov 26 08:37:30 2005 +++ php-src/tests/lang/bug35382.phptSat Nov 26 08:39:55 2005 @@ -1,9 +1,9 @@ ---TEST-- -Bug #35382 (Comment in end of file produces fatal error) ---FILE-- -?php -eval(echo 'Hello'; // comment); -echo World; -//last line comment ---EXPECTF-- -Hello World \ No newline at end of file +--TEST-- +Bug #35382 (Comment in end of file produces fatal error) +--FILE-- +?php +eval(echo 'Hello'; // comment); +echo World; +//last line comment +--EXPECTF-- +Hello World -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
helly Sat Nov 26 11:33:08 2005 EDT
Modified files:
/php-srcrun-tests.php
Log:
- Bug 35382 was nit fixed but the test system was not capable for this kind
of tests
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.237r2=1.238ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.237 php-src/run-tests.php:1.238
--- php-src/run-tests.php:1.237 Thu Oct 6 15:51:03 2005
+++ php-src/run-tests.php Sat Nov 26 11:33:08 2005
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.237 2005/10/06 19:51:03 helly Exp $ */
+/* $Id: run-tests.php,v 1.238 2005/11/26 16:33:08 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -785,10 +785,14 @@
$borked = false;
}
} else {
- if (@count($section_text['FILE']) != 1) {
+ if (@count($section_text['FILE']) +
@count($section_text['FILEEOF']) != 1) {
$bork_info = missing section --FILE-- [$file];
$borked = true;
}
+ if (@count($section_text['FILEEOF']) == 1) {
+ $section_text['FILE'] = preg_replace('/[\r\n]+$/', '',
$section_text['FILEEOF']);
+ unset($section_text['FILEEOF']);
+ }
if ((@count($section_text['EXPECT']) +
@count($section_text['EXPECTF']) + @count($section_text['EXPECTREGEX'])) != 1) {
$bork_info = missing section --EXPECT--, --EXPECTF--
or --EXPECTREGEX-- [$file];
$borked = true;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug35382.phpt
helly Sat Nov 26 11:34:38 2005 EDT Modified files: /php-src/tests/lang bug35382.phpt Log: - Really test the issue here http://cvs.php.net/diff.php/php-src/tests/lang/bug35382.phpt?r1=1.3r2=1.4ty=u Index: php-src/tests/lang/bug35382.phpt diff -u php-src/tests/lang/bug35382.phpt:1.3 php-src/tests/lang/bug35382.phpt:1.4 --- php-src/tests/lang/bug35382.phpt:1.3Sat Nov 26 08:39:55 2005 +++ php-src/tests/lang/bug35382.phptSat Nov 26 11:34:37 2005 @@ -1,6 +1,6 @@ --TEST-- Bug #35382 (Comment in end of file produces fatal error) ---FILE-- +--FILEEOF-- ?php eval(echo 'Hello'; // comment); echo World; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
helly Sat Nov 26 13:07:50 2005 EDT
Modified files:
/php-srcrun-tests.php
Log:
- Output modularization, 1st step
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.238r2=1.239ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.238 php-src/run-tests.php:1.239
--- php-src/run-tests.php:1.238 Sat Nov 26 11:33:08 2005
+++ php-src/run-tests.php Sat Nov 26 13:07:49 2005
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.238 2005/11/26 16:33:08 helly Exp $ */
+/* $Id: run-tests.php,v 1.239 2005/11/26 18:07:49 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -337,8 +337,7 @@
fclose($failed_tests_file);
}
if (count($test_files) || count($test_results)) {
- echo
-=;
+ echo
=;
compute_summary();
echo get_summary(false);
}
@@ -463,8 +462,7 @@
compute_summary();
-echo
-=
+echo =
TIME END . date('Y-m-d H:i:s', $end_time);
$summary = get_summary(true);
@@ -720,10 +718,30 @@
}
}
+function show_redirect_start($tests, $tested)
+{
+ echo --- $tests ($tested)\n;
+}
+
+function show_redirect_ends($tests, $tested)
+{
+ echo --- $tests ($tested) done\n;
+}
+
+function show_test($test_idx, $test_cnt, $shortname)
+{
+ echo TEST $test_idx/$test_cnt [$shortname]\r;
+ flush();
+}
+
+function show_result($result, $tested, $file, $extra = '')
+{
+ echo $result $tested $extra\n;
+}
+
//
// Run an individual test case.
//
-
function run_test($php, $file)
{
global $log_format, $info_params, $ini_overwrites, $cwd,
$PHP_FAILED_TESTS, $pass_options, $DETAILED, $IN_REDIRECT, $test_cnt, $test_idx;
@@ -780,7 +798,7 @@
if (@count($section_text['REDIRECTTEST']) == 1) {
if ($IN_REDIRECT) {
$borked = true;
- $bork_info = Can't redirect a test from within a
redirected test;
+ $bork_info = Can't redirect a test from within a
redirected test [$file];
} else {
$borked = false;
}
@@ -796,18 +814,16 @@
if ((@count($section_text['EXPECT']) +
@count($section_text['EXPECTF']) + @count($section_text['EXPECTREGEX'])) != 1) {
$bork_info = missing section --EXPECT--, --EXPECTF--
or --EXPECTREGEX-- [$file];
$borked = true;
- print_r($section_text);
}
if ((@count($section_text['UEXPECT']) +
@count($section_text['UEXPECTF']) + @count($section_text['UEXPECTREGEX'])) 1)
{
$bork_info = missing section --UEXPECT--, --UEXPECTF--
or --UEXPECTREGEX-- [$file];
$borked = true;
- print_r($section_text);
}
}
fclose($fp);
if ($borked) {
- echo BORK $bork_info [$file]\n;
+ show_result(BORK, $bork_info, $file);
$PHP_FAILED_TESTS['BORKED'][] = array (
'name' = $file,
'test_name' =
'',
@@ -829,8 +845,7 @@
$shortname = str_replace($cwd.'/', '', $file);
$tested = trim($section_text['TEST']). [$shortname];
- echo TEST $test_idx/$test_cnt [$shortname]\r;
- flush();
+ show_test($test_idx, $test_cnt, $shortname);
if (is_array($IN_REDIRECT)) {
$tmp = $IN_REDIRECT['dir'];
@@ -886,12 +901,11 @@
$output = system_with_timeout($extra $php -q
$skipif_params $tmp_skipif);
@unlink($tmp_skipif);
if (eregi(^skip, trim($output))) {
- echo SKIP $tested;
$reason = (eregi(^skip[[:space:]]*(.+)\$,
trim($output))) ? eregi_replace(^skip[[:space:]]*(.+)\$, \\1,
trim($output)) : FALSE;
if ($reason) {
- echo (reason: $reason)\n;
+ show_result(SKIP, $tested, $file,
reason: $reason);
} else {
- echo \n;
+ show_result(SKIP, $tested, $file);
}
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo package.xml pdo.c /ext/pdo_dblib package.xml pdo_dblib.c /ext/pdo_mysql package.xml pdo_mysql.c /ext/pdo_odbc package.xml pdo_odbc.c /ext/pdo_pgsql package
wez Sat Nov 26 15:50:09 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdopackage.xml pdo.c /php-src/ext/pdo_dblib package.xml pdo_dblib.c /php-src/ext/pdo_mysql package.xml pdo_mysql.c /php-src/ext/pdo_odbc package.xml pdo_odbc.c /php-src/ext/pdo_pgsql package.xml pdo_pgsql.c /php-src/ext/pdo_sqlite package.xml pdo_sqlite.c Log: set to 1.0 stable. http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.19.2.5r2=1.19.2.6ty=u Index: php-src/ext/pdo/package.xml diff -u php-src/ext/pdo/package.xml:1.19.2.5 php-src/ext/pdo/package.xml:1.19.2.6 --- php-src/ext/pdo/package.xml:1.19.2.5Thu Nov 24 17:25:37 2005 +++ php-src/ext/pdo/package.xml Sat Nov 26 15:50:06 2005 @@ -42,7 +42,7 @@ release statestable/state version1.0/version - date2005-11-24/date + date2005-11-26/date notes ** NOTE WELL! ** http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.57.2.11r2=1.57.2.12ty=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.57.2.11 php-src/ext/pdo/pdo.c:1.57.2.12 --- php-src/ext/pdo/pdo.c:1.57.2.11 Fri Nov 25 11:01:35 2005 +++ php-src/ext/pdo/pdo.c Sat Nov 26 15:50:06 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo.c,v 1.57.2.11 2005/11/25 16:01:35 sniper Exp $ */ +/* $Id: pdo.c,v 1.57.2.12 2005/11/26 20:50:06 wez Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -133,7 +133,7 @@ PHP_RINIT(pdo), PHP_RSHUTDOWN(pdo), PHP_MINFO(pdo), - 1.0RC2, + 1.0, STANDARD_MODULE_PROPERTIES }; /* }}} */ http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/package.xml?r1=1.2.2.3r2=1.2.2.4ty=u Index: php-src/ext/pdo_dblib/package.xml diff -u php-src/ext/pdo_dblib/package.xml:1.2.2.3 php-src/ext/pdo_dblib/package.xml:1.2.2.4 --- php-src/ext/pdo_dblib/package.xml:1.2.2.3 Tue Nov 1 08:14:10 2005 +++ php-src/ext/pdo_dblib/package.xml Sat Nov 26 15:50:07 2005 @@ -23,9 +23,9 @@ /description licensePHP/license release - statebeta/state - version1.0RC2/version - date2005-11-01/date + statestable/state + version1.0/version + date2005-11-26/date notes Update code for API changes in PDO; no actual changes have been made to this driver. @@ -37,6 +37,7 @@ Windows platforms. ** Changes ** +- Fix Bug #34777; segfault when retrieving non-existent error info - Fix Bug #35032; didn't find FreeTDS includes on some systems /notes @@ -53,7 +54,7 @@ /filelist deps dep type=php rel=ge version=5.0.3/ - dep type=ext name=pdo rel=ge version=1.0RC2/ + dep type=ext name=pdo rel=ge version=1.0/ /deps /release /package http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.9.2.2r2=1.9.2.3ty=u Index: php-src/ext/pdo_dblib/pdo_dblib.c diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.2 php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.3 --- php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.2 Fri Nov 25 11:01:39 2005 +++ php-src/ext/pdo_dblib/pdo_dblib.c Sat Nov 26 15:50:07 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: pdo_dblib.c,v 1.9.2.2 2005/11/25 16:01:39 sniper Exp $ */ +/* $Id: pdo_dblib.c,v 1.9.2.3 2005/11/26 20:50:07 wez Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -65,7 +65,7 @@ NULL, PHP_RSHUTDOWN(pdo_dblib), PHP_MINFO(pdo_dblib), - 1.0RC1, + 1.0, STANDARD_MODULE_PROPERTIES }; http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/package.xml?r1=1.11.2.2r2=1.11.2.3ty=u Index: php-src/ext/pdo_mysql/package.xml diff -u php-src/ext/pdo_mysql/package.xml:1.11.2.2 php-src/ext/pdo_mysql/package.xml:1.11.2.3 --- php-src/ext/pdo_mysql/package.xml:1.11.2.2 Mon Oct 31 22:00:05 2005 +++ php-src/ext/pdo_mysql/package.xml Sat Nov 26 15:50:07 2005 @@ -2,7 +2,7 @@ !DOCTYPE package SYSTEM ../pear/package.dtd package version=1.0 namePDO_MYSQL/name - summaryMysql 3.x/4.0 driver for PDO/summary + summaryMySQL driver for PDO/summary maintainers maintainer usergschlossnagle/user @@ -29,9 +29,9 @@ /description licensePHP/license release - statebeta/state - version1.0RC2/version - date2005-10-01/date + statestable/state + version1.0/version + date2005-11-26/date notes ** Changes ** @@ -61,7 +61,7 @@ /filelist deps dep type=php rel=ge version=5.0.3/ - dep type=ext name=pdo rel=ge version=1.0RC2/ + dep type=ext name=pdo rel=ge version=1.0/ /deps /release /package http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.8.2.7r2=1.8.2.8ty=u Index: php-src/ext/pdo_mysql/pdo_mysql.c diff -u php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.7 php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.8 --- php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.7 Fri Nov 25 11:01:39 2005 +++ php-src/ext/pdo_mysql/pdo_mysql.c Sat Nov 26 15:50:07 2005 @@ -16,7 +16,7 @@
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
iliaa Sat Nov 26 16:04:43 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Bug fixing news http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.226r2=1.2027.2.227ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.226 php-src/NEWS:1.2027.2.227 --- php-src/NEWS:1.2027.2.226 Sat Nov 26 08:12:52 2005 +++ php-src/NEWSSat Nov 26 16:04:42 2005 @@ -5,6 +5,7 @@ - Added an additional field $frame['object'] to the result array of debug_backtrace() that contains a reference to the respective object when the frame was called from an object. (Sebastian) +- Fixed bug #35413 (Removed -dev flag from Zend Engine version). (Ilia) - Fixed bug #35406 (eval hangs when evall'ed code ends with comment w/o newline). (Marcus) - Fixed bug #35402 (New date class causes crash in get_object_vars()). (Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/mysqli/tests 009.phpt
Andrey Hristov wrote: andreyThu Nov 24 20:13:58 2005 EDT why this change, it breaks the test? Data in mysql shows - which is what is being returned, how can a return value 0 be correct? Ilia -- 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) /ext/pdo pdo_stmt.c
wez Sat Nov 26 16:20:54 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdopdo_stmt.c
Log:
Doh, need to canonicalize parameter names (by prefixing with :) before
attempting to remap them to positional args.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.20r2=1.118.2.21ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.20
php-src/ext/pdo/pdo_stmt.c:1.118.2.21
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.20 Thu Nov 24 22:23:17 2005
+++ php-src/ext/pdo/pdo_stmt.c Sat Nov 26 16:20:52 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.20 2005/11/25 03:23:17 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.21 2005/11/26 21:20:52 wez Exp $ */
/* The PDO Statement Handle Class */
@@ -306,10 +306,6 @@
}
}
- if (is_param !rewrite_name_to_position(stmt, param TSRMLS_CC)) {
- return 0;
- }
-
if (param-name) {
if (is_param param-name[0] != ':') {
char *temp = emalloc(++param-namelen + 1);
@@ -320,6 +316,14 @@
param-name = estrndup(param-name, param-namelen);
}
}
+
+ if (is_param !rewrite_name_to_position(stmt, param TSRMLS_CC)) {
+ if (param-name) {
+ efree(param-name);
+ param-name = NULL;
+ }
+ return 0;
+ }
/* tell the driver we just created a parameter */
if (stmt-methods-param_hook) {
--
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) /ext/pdo package.xml pdo.c
wez Sat Nov 26 16:22:49 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdopackage.xml pdo.c Log: going to release 1.0.1 http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.19.2.6r2=1.19.2.7ty=u Index: php-src/ext/pdo/package.xml diff -u php-src/ext/pdo/package.xml:1.19.2.6 php-src/ext/pdo/package.xml:1.19.2.7 --- php-src/ext/pdo/package.xml:1.19.2.6Sat Nov 26 15:50:06 2005 +++ php-src/ext/pdo/package.xml Sat Nov 26 16:22:49 2005 @@ -41,7 +41,7 @@ licensePHP/license release statestable/state - version1.0/version + version1.0.1/version date2005-11-26/date notes http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.57.2.12r2=1.57.2.13ty=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.57.2.12 php-src/ext/pdo/pdo.c:1.57.2.13 --- php-src/ext/pdo/pdo.c:1.57.2.12 Sat Nov 26 15:50:06 2005 +++ php-src/ext/pdo/pdo.c Sat Nov 26 16:22:49 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo.c,v 1.57.2.12 2005/11/26 20:50:06 wez Exp $ */ +/* $Id: pdo.c,v 1.57.2.13 2005/11/26 21:22:49 wez Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -133,7 +133,7 @@ PHP_RINIT(pdo), PHP_RSHUTDOWN(pdo), PHP_MINFO(pdo), - 1.0, + 1.0.1, STANDARD_MODULE_PROPERTIES }; /* }}} */ -- 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) /ext/pdo_oci package.xml pdo_oci.c
wez Sat Nov 26 16:25:40 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_ocipackage.xml pdo_oci.c Log: going stable http://cvs.php.net/diff.php/php-src/ext/pdo_oci/package.xml?r1=1.4.2.2r2=1.4.2.3ty=u Index: php-src/ext/pdo_oci/package.xml diff -u php-src/ext/pdo_oci/package.xml:1.4.2.2 php-src/ext/pdo_oci/package.xml:1.4.2.3 --- php-src/ext/pdo_oci/package.xml:1.4.2.2 Mon Oct 31 22:04:49 2005 +++ php-src/ext/pdo_oci/package.xml Sat Nov 26 16:25:39 2005 @@ -16,9 +16,9 @@ /description licensePHP/license release - statebeta/state - version1.0RC2/version - date2005-11-01/date + statestable/state + version1.0/version + date2005-11-26/date notes You need to install the PDO core module before you can make use of this one. @@ -47,7 +47,7 @@ /filelist deps dep type=php rel=ge version=5.0.3/ - dep type=ext rel=ge name=pdo version=1.0RC2/ + dep type=ext rel=ge name=pdo version=1.0/ /deps /release /package http://cvs.php.net/diff.php/php-src/ext/pdo_oci/pdo_oci.c?r1=1.5.2.2r2=1.5.2.3ty=u Index: php-src/ext/pdo_oci/pdo_oci.c diff -u php-src/ext/pdo_oci/pdo_oci.c:1.5.2.2 php-src/ext/pdo_oci/pdo_oci.c:1.5.2.3 --- php-src/ext/pdo_oci/pdo_oci.c:1.5.2.2 Fri Nov 25 11:01:40 2005 +++ php-src/ext/pdo_oci/pdo_oci.c Sat Nov 26 16:25:39 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pdo_oci.c,v 1.5.2.2 2005/11/25 16:01:40 sniper Exp $ */ +/* $Id: pdo_oci.c,v 1.5.2.3 2005/11/26 21:25:39 wez Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -59,7 +59,7 @@ NULL, NULL, PHP_MINFO(pdo_oci), - 1.0RC1, + 1.0, STANDARD_MODULE_PROPERTIES }; /* }}} */ -- 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) /ext/pdo TODO
wez Sat Nov 26 16:29:33 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdoTODO Log: update the todo list http://cvs.php.net/diff.php/php-src/ext/pdo/TODO?r1=1.6.2.1r2=1.6.2.2ty=u Index: php-src/ext/pdo/TODO diff -u php-src/ext/pdo/TODO:1.6.2.1 php-src/ext/pdo/TODO:1.6.2.2 --- php-src/ext/pdo/TODO:1.6.2.1Fri Nov 25 02:23:55 2005 +++ php-src/ext/pdo/TODOSat Nov 26 16:29:31 2005 @@ -1,10 +1,14 @@ -$Id: TODO,v 1.6.2.1 2005/11/25 07:23:55 wez Exp $ +$Id: TODO,v 1.6.2.2 2005/11/26 21:29:31 wez Exp $ Roadmap for PDO Core, version 1.1: == + - Add PDO::queryParams(), similar to PDO::query(), but accepts + an array of parameters as the second argument, pushing the remaining + args (which are args to setFetchMode()) up by one. + - Separate the handle factory call into two phases: - handle creation - connecting -- 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/tokenizer tokenizer.c
iliaa Sun Nov 27 01:41:33 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/tokenizer tokenizer.c
/php-srcNEWS
Log:
tokenizer fixes for bug #35382
Bug fixing news
http://cvs.php.net/diff.php/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.2r2=1.31.2.3ty=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.2
php-src/ext/tokenizer/tokenizer.c:1.31.2.3
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.2 Thu Nov 10 02:50:59 2005
+++ php-src/ext/tokenizer/tokenizer.c Sun Nov 27 01:41:31 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tokenizer.c,v 1.31.2.2 2005/11/10 07:50:59 sniper Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.3 2005/11/27 06:41:31 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -344,6 +344,8 @@
while ((token_type = lex_scan(token TSRMLS_CC))) {
destroy = 1;
switch (token_type) {
+ case EOF:
+ zendleng--; /* don't count EOF */
case T_OPEN_TAG:
case T_OPEN_TAG_WITH_ECHO:
case T_WHITESPACE:
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.227r2=1.2027.2.228ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.227 php-src/NEWS:1.2027.2.228
--- php-src/NEWS:1.2027.2.227 Sat Nov 26 16:04:42 2005
+++ php-src/NEWSSun Nov 27 01:41:32 2005
@@ -1,16 +1,18 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.1.1
-- Changed reflection constants to class constants. (Johannes)
+- Make reflection constants be both PHP and class constants. (Johannes)
- Added an additional field $frame['object'] to the result array of
debug_backtrace() that contains a reference to the respective object when the
frame was called from an object. (Sebastian)
- Fixed bug #35413 (Removed -dev flag from Zend Engine version). (Ilia)
+- Fixed bug #35411 (Regression with \{$ handling). (Ilia)
- Fixed bug #35406 (eval hangs when evall'ed code ends with comment w/o
newline). (Marcus)
- Fixed bug #35402 (New date class causes crash in get_object_vars()). (Tony)
- Fixed bug #35391 (pdo_mysql::exec does not return number of affected rows).
(Tony)
+- Fixed bug #35382 (Comment in end of file produces fatal error). (Ilia)
- Fixed bug #35360 (exceptions in interactive mode (php -a) may cause crash).
(Dmitry)
- Fixed bug #35358 (Incorrect error messages for PDO class constants). (Ilia)
--
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/tests bug33869.phpt bug34087.phpt bug34676.phpt bug34771.phpt date_default_timezone_set-1.phpt mktime-3.phpt strtotime.phpt
iliaa Sun Nov 27 01:51:44 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/date php_date.c
/php-src/ext/date/tests bug33869.phpt bug34087.phpt bug34676.phpt
bug34771.phpt
date_default_timezone_set-1.phpt
mktime-3.phpt strtotime.phpt
Log:
Disabled native date class, to prevent pear::date conflict.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.228r2=1.2027.2.229ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.228 php-src/NEWS:1.2027.2.229
--- php-src/NEWS:1.2027.2.228 Sun Nov 27 01:41:32 2005
+++ php-src/NEWSSun Nov 27 01:51:39 2005
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.1.1
+- Disabled native date class, to prevent pear::date conflict. (Ilia)
- Make reflection constants be both PHP and class constants. (Johannes)
- Added an additional field $frame['object'] to the result array of
debug_backtrace() that contains a reference to the respective object when the
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.24r2=1.43.2.25ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.24
php-src/ext/date/php_date.c:1.43.2.25
--- php-src/ext/date/php_date.c:1.43.2.24 Sat Nov 26 07:35:27 2005
+++ php-src/ext/date/php_date.c Sun Nov 27 01:51:40 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.24 2005/11/26 12:35:27 tony2001 Exp $ */
+/* $Id: php_date.c,v 1.43.2.25 2005/11/27 06:51:40 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -74,9 +74,8 @@
{NULL, NULL, NULL}
};
-
-function_entry date_funcs_date[] = {
#ifdef EXPERIMENTAL_DATE_SUPPORT
+function_entry date_funcs_date[] = {
ZEND_NAMED_FE(format, ZEND_FN(date_format), NULL)
ZEND_NAMED_FE(modify, ZEND_FN(date_modify), NULL)
ZEND_NAMED_FE(getTimezone, ZEND_FN(date_timezone_get), NULL)
@@ -85,23 +84,21 @@
ZEND_NAMED_FE(setTime, ZEND_FN(date_time_set), NULL)
ZEND_NAMED_FE(setDate, ZEND_FN(date_date_set), NULL)
ZEND_NAMED_FE(setISODate, ZEND_FN(date_isodate_set), NULL)
-#endif
{NULL, NULL, NULL}
};
function_entry date_funcs_timezone[] = {
-#ifdef EXPERIMENTAL_DATE_SUPPORT
ZEND_NAMED_FE(getName, ZEND_FN(timezone_name_get), NULL)
ZEND_NAMED_FE(getOffset, ZEND_FN(timezone_offset_get), NULL)
ZEND_NAMED_FE(getTransistions, ZEND_FN(timezone_transistions_get), NULL)
ZEND_MALIAS(timezone, listAbbreviations, abbreviations_list, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_MALIAS(timezone, listIdentifiers, identifiers_list, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
{NULL, NULL, NULL}
};
-static char* guess_timezone(TSRMLS_D);
static void date_register_classes(TSRMLS_D);
+#endif
+static char* guess_timezone(TSRMLS_D);
/* }}} */
ZEND_DECLARE_MODULE_GLOBALS(date)
@@ -116,6 +113,7 @@
PHP_INI_END()
/* }}} */
+#ifdef EXPERIMENTAL_DATE_SUPPORT
zend_class_entry *date_ce_date, *date_ce_timezone;
static zend_object_handlers date_object_handlers_date;
@@ -134,7 +132,6 @@
timelib_tzinfo *tz;
};
-#ifdef EXPERIMENTAL_DATE_SUPPORT
#define DATE_SET_CONTEXT \
zval *object; \
object = getThis(); \
@@ -153,12 +150,11 @@
} \
obj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC);
\
-#endif
-
static void date_object_free_storage_date(void *object TSRMLS_DC);
static void date_object_free_storage_timezone(void *object TSRMLS_DC);
static zend_object_value date_object_new_date(zend_class_entry *class_type
TSRMLS_DC);
static zend_object_value date_object_new_timezone(zend_class_entry *class_type
TSRMLS_DC);
+#endif
/* {{{ Module struct */
zend_module_entry date_module_entry = {
@@ -235,8 +231,19 @@
{
ZEND_INIT_MODULE_GLOBALS(date, php_date_init_globals, NULL);
REGISTER_INI_ENTRIES();
-
+#ifdef EXPERIMENTAL_DATE_SUPPORT
date_register_classes(TSRMLS_C);
+#endif
+ REGISTER_STRING_CONSTANT(DATE_ATOM,DATE_FORMAT_ISO8601, CONST_CS
| CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT(DATE_COOKIE, DATE_FORMAT_RFC1123, CONST_CS
| CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT(DATE_ISO8601, DATE_FORMAT_ISO8601, CONST_CS
| CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT(DATE_RFC822, DATE_FORMAT_RFC1123, CONST_CS
| CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT(DATE_RFC850, DATE_FORMAT_RFC1036, CONST_CS
| CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT(DATE_RFC1036, DATE_FORMAT_RFC1036, CONST_CS
| CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT(DATE_RFC1123, DATE_FORMAT_RFC1123, CONST_CS
| CONST_PERSISTENT);
+
