[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Mar 20 20:42:28 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.659r2=1.660ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.659 ZendEngine2/ChangeLog:1.660 --- ZendEngine2/ChangeLog:1.659 Sat Mar 19 20:35:48 2005 +++ ZendEngine2/ChangeLog Sun Mar 20 20:42:27 2005 @@ -1,3 +1,11 @@ +2005-03-20 Marcus Boerger [EMAIL PROTECTED] + +* tests/bug31102.phpt: + - Added missing description (thanks jani) + +* tests/bug31102.phpt: + - Add new test + 2005-03-19 Marcus Boerger [EMAIL PROTECTED] * zend_object_handlers.c: @@ -7413,7 +7421,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.659 2005/03/20 01:35:48 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.660 2005/03/21 01:42:27 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -9137,7 +9145,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.659 2005/03/20 01:35:48 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.660 2005/03/21 01:42:27 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/soap soap.c
dmitry Sun Mar 20 04:55:34 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/soap soap.c Log: Fixed SoapFault::details passing http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.25r2=1.110.2.26ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.110.2.25 php-src/ext/soap/soap.c:1.110.2.26 --- php-src/ext/soap/soap.c:1.110.2.25 Fri Feb 4 10:42:27 2005 +++ php-src/ext/soap/soap.c Sun Mar 20 04:55:33 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: soap.c,v 1.110.2.25 2005/02/04 15:42:27 dmitry Exp $ */ +/* $Id: soap.c,v 1.110.2.26 2005/03/20 09:55:33 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2708,9 +2708,6 @@ add_property_string(obj, faultactor, fault_actor, 1); } if (fault_detail != NULL) { -#ifdef ZEND_ENGINE_2 - fault_detail-refcount--; -#endif add_property_zval(obj, detail, fault_detail); } if (name != NULL) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap soap.c
dmitry Sun Mar 20 04:55:48 2005 EDT Modified files: /php-src/ext/soap soap.c Log: Fixed SoapFault::details passing http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.137r2=1.138ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.137 php-src/ext/soap/soap.c:1.138 --- php-src/ext/soap/soap.c:1.137 Fri Feb 4 10:42:46 2005 +++ php-src/ext/soap/soap.c Sun Mar 20 04:55:47 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: soap.c,v 1.137 2005/02/04 15:42:46 dmitry Exp $ */ +/* $Id: soap.c,v 1.138 2005/03/20 09:55:47 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2708,9 +2708,6 @@ add_property_string(obj, faultactor, fault_actor, 1); } if (fault_detail != NULL) { -#ifdef ZEND_ENGINE_2 - fault_detail-refcount--; -#endif add_property_zval(obj, detail, fault_detail); } if (name != NULL) { -- 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
iliaa Sun Mar 20 14:47:14 2005 EDT Modified files: /php-srcrun-tests.php Log: Detect shtool properly when build-dir != php source dir. http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.208r2=1.209ty=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.208 php-src/run-tests.php:1.209 --- php-src/run-tests.php:1.208 Fri Mar 18 17:43:40 2005 +++ php-src/run-tests.php Sun Mar 20 14:47:13 2005 @@ -511,7 +511,7 @@ $libtool = shell_exec($CUR_DIR . '/libtool --version'); /* Use shtool to find out if there is glibtool present (MacOSX) */ - $sys_libtool_path = shell_exec(./build/shtool path glibtool libtool); + $sys_libtool_path = shell_exec(dirname(__FILE__) . ./build/shtool path glibtool libtool); $sys_libtool = shell_exec(str_replace(\n, , $sys_libtool_path) . ' --version'); /* Try the most common flags for 'version' */ -- 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) / run-tests.php
iliaa Sun Mar 20 14:47:25 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcrun-tests.php Log: MFH: Detect shtool properly when build-dir != php source dir. http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.195.2.5r2=1.195.2.6ty=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.195.2.5 php-src/run-tests.php:1.195.2.6 --- php-src/run-tests.php:1.195.2.5 Tue Feb 22 20:17:20 2005 +++ php-src/run-tests.php Sun Mar 20 14:47:24 2005 @@ -478,7 +478,7 @@ $libtool = shell_exec($_SERVER['PWD'] . '/libtool --version'); /* Use shtool to find out if there is glibtool present (MacOSX) */ - $sys_libtool_path = shell_exec({$_SERVER['PWD']}/build/shtool path glibtool libtool); + $sys_libtool_path = shell_exec(dirname(__FILE__) . /build/shtool path glibtool libtool); $sys_libtool = shell_exec(str_replace(\n, , $sys_libtool_path) . ' --version'); /* Try the most common flags for 'version' */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite/tests/pdo pdo_023.phpt pecl/pdo/tests pdo_023.inc pdo_023_def.inc pecl/pdo_mysql/tests pdo_023.phpt pecl/pdo_pgsql/tests pdo_023.phpt pecl/pdo_sqlite/tests pdo_023.phpt
helly Sun Mar 20 19:29:25 2005 EDT Added files: /pecl/pdo/tests pdo_023.inc pdo_023_def.inc /pecl/pdo_mysql/tests pdo_023.phpt /pecl/pdo_pgsql/tests pdo_023.phpt /pecl/pdo_sqlite/tests pdo_023.phpt /php-src/ext/sqlite/tests/pdo pdo_023.phpt Log: - Add new tests http://cvs.php.net/co.php/pecl/pdo/tests/pdo_023.inc?r=1.1p=1 Index: pecl/pdo/tests/pdo_023.inc +++ pecl/pdo/tests/pdo_023.inc ?php # vim:ft=php require_once('pdo.inc'); set_sql('create1', 'CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(0, \'A\')'); set_sql('insert2', 'INSERT INTO test VALUES(1, \'B\')'); set_sql('select1', 'SELECT val, id FROM test'); $DB-test(); var_dump($DB); $DB-query($SQL['create1']); $DB-query($SQL['insert1']); $DB-query($SQL['insert2']); $stmt = $DB-query($SQL['select1']); var_dump($stmt); var_dump($stmt-fetchAll(PDO_FETCH_COLUMN|PDO_FETCH_UNIQUE)); $stmt = NULL; $DB = NULL; ? http://cvs.php.net/co.php/pecl/pdo/tests/pdo_023_def.inc?r=1.1p=1 Index: pecl/pdo/tests/pdo_023_def.inc +++ pecl/pdo/tests/pdo_023_def.inc ?php class PDOStatementX extends PDOStatement { public $test1 = 1; protected function __construct() { $this-test2 = 2; $this-test2 = 22; echo __METHOD__ . ()\n; } function __destruct() { echo __METHOD__ . ()\n; } } class PDODatabaseX extends PDO { public $test1 = 1; function __construct($connect) { echo __METHOD__ . ()\n; parent::__construct($connect); } function __destruct() { echo __METHOD__ . ()\n; } function test() { $this-test2 = 2; var_dump($this-test1); var_dump($this-test2); $this-test2 = 22; } function query($sql) { echo __METHOD__ . ()\n; $stmt = parent::prepare($sql, array(PDO_ATTR_STATEMENT_CLASS=array('PDOStatementx'))); $stmt-execute(); return $stmt; } } ? http://cvs.php.net/co.php/pecl/pdo_mysql/tests/pdo_023.phpt?r=1.1p=1 Index: pecl/pdo_mysql/tests/pdo_023.phpt +++ pecl/pdo_mysql/tests/pdo_023.phpt --TEST-- PDO_MySQL: Overloading --SKIPIF-- ?php # vim:ft=php require_once('skipif.inc'); ? --FILE-- ?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_023_def.inc'); $DB = NULL; $DB = new PDODatabaseX($CONNECTION); $DB-setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING); require_once($PDO_TESTS . 'pdo_023.inc'); ? ===DONE=== ?php exit(0); ? --EXPECTF-- PDODatabaseX::__construct() int(1) int(2) object(PDODatabaseX)#%d (2) { [test1]= int(1) [test2]= int(22) } PDODatabaseX::query() PDOStatementX::__construct() PDOStatementX::__destruct() PDODatabaseX::query() PDOStatementX::__construct() PDOStatementX::__destruct() PDODatabaseX::query() PDOStatementX::__construct() PDOStatementX::__destruct() PDODatabaseX::query() PDOStatementX::__construct() object(PDOStatementX)#%d (3) { [test1]= int(1) [queryString]= string(24) SELECT val, id FROM test [test2]= int(22) } array(2) { [A]= string(1) 0 [B]= string(1) 1 } PDOStatementX::__destruct() PDODatabaseX::__destruct() ===DONE=== http://cvs.php.net/co.php/pecl/pdo_pgsql/tests/pdo_023.phpt?r=1.1p=1 Index: pecl/pdo_pgsql/tests/pdo_023.phpt +++ pecl/pdo_pgsql/tests/pdo_023.phpt --TEST-- PDO_PGSQL: Overloading --SKIPIF-- ?php # vim:ft=php require_once('skipif.inc'); ? --FILE-- ?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_023_def.inc'); $DB = NULL; $DB = new PDODatabaseX($CONNECTION); $DB-setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING); require_once($PDO_TESTS . 'pdo_023.inc'); ? ===DONE=== ?php exit(0); ? --EXPECTF-- PDODatabaseX::__construct() int(1) int(2) object(PDODatabaseX)#%d (2) { [test1]= int(1) [test2]= int(22) } PDODatabaseX::query() PDOStatementX::__construct() PDOStatementX::__destruct() PDODatabaseX::query() PDOStatementX::__construct() PDOStatementX::__destruct() PDODatabaseX::query() PDOStatementX::__construct() PDOStatementX::__destruct() PDODatabaseX::query() PDOStatementX::__construct() object(PDOStatementX)#%d (3) { [test1]= int(1) [queryString]= string(24) SELECT val, id FROM test [test2]= int(22) } array(2) { [A]= int(0) [B]= int(1) } PDOStatementX::__destruct() PDODatabaseX::__destruct() ===DONE=== http://cvs.php.net/co.php/pecl/pdo_sqlite/tests/pdo_023.phpt?r=1.1p=1 Index: pecl/pdo_sqlite/tests/pdo_023.phpt +++ pecl/pdo_sqlite/tests/pdo_023.phpt --TEST-- PDO_SQLite: Overloading --SKIPIF-- ?php # vim:ft=php require_once('skipif.inc'); ? --FILE-- ?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_023_def.inc'); $DB = NULL; $DB = new PDODatabaseX('sqlite::memory:'); $DB-setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING);
[PHP-CVS] cvs: php-src /ext/sqlite/tests/pdo pdo_022.phpt
helly Sun Mar 20 19:32:50 2005 EDT Modified files: /php-src/ext/sqlite/tests/pdo pdo_022.phpt Log: - Fix test (warnings are expected since there is no support for this) http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/pdo/pdo_022.phpt?r1=1.1r2=1.2ty=u Index: php-src/ext/sqlite/tests/pdo/pdo_022.phpt diff -u php-src/ext/sqlite/tests/pdo/pdo_022.phpt:1.1 php-src/ext/sqlite/tests/pdo/pdo_022.phpt:1.2 --- php-src/ext/sqlite/tests/pdo/pdo_022.phpt:1.1 Fri Mar 11 19:51:39 2005 +++ php-src/ext/sqlite/tests/pdo/pdo_022.phpt Sun Mar 20 19:32:48 2005 @@ -14,71 +14,16 @@ ? ===DONE=== ?php exit(0); ? ---EXPECT-- -array(7) { - [native_type]= - string(7) integer - [sqlite:decl_type]= - string(3) INT - [flags]= - array(0) { - } - [name]= - string(2) id - [len]= - int(-1) - [precision]= - int(0) - [pdo_type]= - int(2) -} -array(7) { - [native_type]= - string(6) string - [sqlite:decl_type]= - string(11) VARCHAR(10) - [flags]= - array(0) { - } - [name]= - string(3) val - [len]= - int(-1) - [precision]= - int(0) - [pdo_type]= - int(2) -} -array(7) { - [native_type]= - string(6) string - [sqlite:decl_type]= - string(11) VARCHAR(16) - [flags]= - array(0) { - } - [name]= - string(4) val2 - [len]= - int(-1) - [precision]= - int(0) - [pdo_type]= - int(2) -} -array(6) { - [native_type]= - string(7) integer - [flags]= - array(0) { - } - [name]= - string(8) COUNT(*) - [len]= - int(-1) - [precision]= - int(0) - [pdo_type]= - int(2) -} +--EXPECTF-- +Warning: PDOStatement::getColumnMeta(): SQLSTATE[IM001]: Driver does not support this function: driver doesn't support meta data in %spdo_022.inc on line %d +bool(false) + +Warning: PDOStatement::getColumnMeta(): SQLSTATE[IM001]: Driver does not support this function: driver doesn't support meta data in %spdo_022.inc on line %d +bool(false) + +Warning: PDOStatement::getColumnMeta(): SQLSTATE[IM001]: Driver does not support this function: driver doesn't support meta data in %spdo_022.inc on line %d +bool(false) + +Warning: PDOStatement::getColumnMeta(): SQLSTATE[IM001]: Driver does not support this function: driver doesn't support meta data in %spdo_022.inc on line %d +bool(false) ===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy tidy.c
johnSun Mar 20 22:54:30 2005 EDT Modified files: /php-src/ext/tidy tidy.c Log: Added three new properties to the node: line, column and if it is propreitary or not http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.63r2=1.64ty=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.63 php-src/ext/tidy/tidy.c:1.64 --- php-src/ext/tidy/tidy.c:1.63Tue Feb 8 00:25:48 2005 +++ php-src/ext/tidy/tidy.c Sun Mar 20 22:54:29 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: tidy.c,v 1.63 2005/02/08 05:25:48 rasmus Exp $ */ +/* $Id: tidy.c,v 1.64 2005/03/21 03:54:29 john Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -143,6 +143,14 @@ zend_hash_update(_table, #_key, sizeof(#_key), (void *)tmp, sizeof(zval *), NULL); \ } +#define ADD_PROPERTY_BOOL(_table, _key, _bool) \ +{ \ + zval *tmp; \ + MAKE_STD_ZVAL(tmp); \ + ZVAL_BOOL(tmp, _bool); \ + zend_hash_update(_table, #_key, sizeof(#_key), (void *)tmp, sizeof(zval *), NULL); \ + } + #define TIDY_SAFE_MODE_CHECK(filename) \ if ((PG(safe_mode) (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC)) { \ RETURN_FALSE; \ @@ -720,6 +728,9 @@ ADD_PROPERTY_STRING(obj-std.properties, name, tidyNodeGetName(obj-node)); ADD_PROPERTY_LONG(obj-std.properties, type, tidyNodeGetType(obj-node)); + ADD_PROPERTY_LONG(obj-std.properties, line, tidyNodeLine(obj-node)); +ADD_PROPERTY_LONG(obj-std.properties, column, tidyNodeColumn(obj-node)); +ADD_PROPERTY_BOOL(obj-std.properties, proprietary, tidyNodeIsProp(obj-ptdoc-doc, obj-node)); switch(tidyNodeGetType(obj-node)) { case TidyNode_Root: @@ -945,7 +956,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Tidy support, enabled); php_info_print_table_row(2, libTidy Release, (char *)tidyReleaseDate()); - php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.63 2005/02/08 05:25:48 rasmus Exp $)); + php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.64 2005/03/21 03:54:29 john Exp $)); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php.h
andrei Mon Mar 21 01:43:28 2005 EDT Modified files: /php-src/main php.h Log: Define PHP_ABSTRACT_ME http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.215r2=1.216ty=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.215 php-src/main/php.h:1.216 --- php-src/main/php.h:1.215Wed Mar 16 17:00:03 2005 +++ php-src/main/php.h Mon Mar 21 01:43:28 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.215 2005/03/16 22:00:03 rasmus Exp $ */ +/* $Id: php.h,v 1.216 2005/03/21 06:43:28 andrei Exp $ */ #ifndef PHP_H #define PHP_H @@ -342,6 +342,7 @@ #define PHP_FALIAS ZEND_FALIAS #define PHP_ME ZEND_ME #define PHP_MALIAS ZEND_MALIAS +#define PHP_ASTSRACT_ME ZEND_ABSTRACT_ME #define PHP_ME_MAPPING ZEND_ME_MAPPING #define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main php.h
On Mon, 21 Mar 2005, Andrei Zmievski wrote: andrei Mon Mar 21 01:43:28 2005 EDT Modified files: /php-src/mainphp.h Log: Define PHP_ABSTRACT_ME Why? Why not use the ZEND macros? --Jani http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.215r2=1.216ty=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.215 php-src/main/php.h:1.216 --- php-src/main/php.h:1.215Wed Mar 16 17:00:03 2005 +++ php-src/main/php.h Mon Mar 21 01:43:28 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.215 2005/03/16 22:00:03 rasmus Exp $ */ +/* $Id: php.h,v 1.216 2005/03/21 06:43:28 andrei Exp $ */ #ifndef PHP_H #define PHP_H @@ -342,6 +342,7 @@ #define PHP_FALIAS ZEND_FALIAS #define PHP_ME ZEND_ME #define PHP_MALIAS ZEND_MALIAS +#define PHP_ASTSRACT_ME ZEND_ABSTRACT_ME #define PHP_ME_MAPPING ZEND_ME_MAPPING #define PHP_MODULE_STARTUP_NZEND_MODULE_STARTUP_N -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php