[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Aug 1 01:31:25 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2764r2=1.2765diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2764 php-src/ChangeLog:1.2765 --- php-src/ChangeLog:1.2764Tue Jul 31 01:31:08 2007 +++ php-src/ChangeLog Wed Aug 1 01:31:25 2007 @@ -1,3 +1,154 @@ +2007-07-31 Johannes Schlüter [EMAIL PROTECTED] + +* (PHP_5_2) + ext/tokenizer/CREDITS + ext/tokenizer/config.m4 + ext/tokenizer/php_tokenizer.h + ext/tokenizer/tokenizer.c + ext/tokenizer/tokenizer_data.c + ext/tokenizer/tokenizer_data_gen.sh: + - MFH: Use a script to generate tokenizer data from zend_language_parser.h + +* ext/tokenizer/CREDITS + ext/tokenizer/config.m4 + ext/tokenizer/php_tokenizer.h + ext/tokenizer/tokenizer.c + ext/tokenizer/tokenizer_data.c + ext/tokenizer/tokenizer_data.c + ext/tokenizer/tokenizer_data_gen.sh + ext/tokenizer/tokenizer_data_gen.sh: + - Use a script to generate tokenizer data from zend_language_parser.h + +2007-07-31 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/pdo/pdo_stmt.c: + + Fixed bug #41971 (PDOStatement::fetch and PDOStatement::setFetchMode + causes + unexpected behavior). + +2007-07-31 Johannes Schlüter [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + - BFN + +* (PHP_5_2) + ZendEngine2/zend_builtin_functions.c + ZendEngine2/tests/017.phpt: + - MFH: Add additional param to get_loaded_extensions() for returning Zend +extensions (Fixes #41278) [DOC] + +* ZendEngine2/zend_builtin_functions.c + ZendEngine2/tests/017.phpt: + - Add additional param to get_loaded_extensions() for returning Zend +extensions (Fixes #41278) + +2007-07-31 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_2) + run-tests.php: + MFH:- Allow using * in test filenames to match pattern + +* run-tests.php: + - Allow using * in test filenames to match pattern + +2007-07-31 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ext/oci8/tests/bug42134.phpt: + add test + +* ext/oci8/tests/bug42134.phpt + ext/oci8/tests/bug42134.phpt: + + add test (thanks Chris!) + +* (PHP_5_2) + ext/oci8/oci8_interface.c: + MFH: missing part of the fix for bug #42134 + +* ext/oci8/oci8_interface.c: + missing part of the fix for bug #42134 + +* (PHP_5_2) + NEWS + ext/oci8/oci8.c + ext/oci8/oci8_collection.c + ext/oci8/oci8_interface.c + ext/oci8/oci8_lob.c + ext/oci8/oci8_statement.c + ext/oci8/php_oci8_int.h: + MFH: fix #42134 (oci_error() returns false after oci_new_collection() + fails) + +* ext/oci8/oci8.c + ext/oci8/oci8_collection.c + ext/oci8/oci8_interface.c + ext/oci8/oci8_lob.c + ext/oci8/oci8_statement.c + ext/oci8/php_oci8_int.h: + fix #42134 (oci_error() returns false after oci_new_collection() fails) + +2007-07-31 Sebastian Bergmann [EMAIL PROTECTED] + +* README.namespaces: + Add ext/tokenizer support to the TODO. + +2007-07-31 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +* (PHP_5_2) + ext/simplexml/simplexml.c: + MFH: fix bug #41833 (addChild() on a non-existent node, no node created, + getName() segfaults) + +* ext/simplexml/simplexml.c: + fix bug #41833 (addChild() on a non-existent node, no node created, + getName() segfaults) + +* ext/simplexml/simplexml.c: + fix possible crash + +2007-07-31 Jani Taskinen [EMAIL PROTECTED] + +* ext/interbase/config.m4 + ext/odbc/config.m4 + ext/pdo_firebird/config.m4 + ext/pdo_pgsql/config.m4 + ext/snmp/config.m4: + - Fix some lib vs. $PHP_LIBDIR issues. + +2007-07-31 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ext/mbstring/config.m4: + fix typo + +* ext/mbstring/config.m4: + fix typo + it would be much better if Gentoo people send us this patch long ago + instead of using their private patches. + +* (PHP_5_2) + ext/standard/tests/strings/bug40754.phpt: + fix test + +2007-07-31 Stanislav Malyshev [EMAIL PROTECTED] + +* ext/imap/php_imap.c + ext/imap/php_imap.c: + sometimes c-client returns non-null entry with null host + +* (PHP_5_2) + ext/imap/php_imap.c: + sometimes c-client lib returns non-null entry with null host + 2007-07-30 Pierre-Alain Joye [EMAIL PROTECTED] * ext/gd/gd.c:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Aug 1 01:31:28 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1149r2=1.1150diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1149 ZendEngine2/ChangeLog:1.1150 --- ZendEngine2/ChangeLog:1.1149Sat Jul 28 01:34:20 2007 +++ ZendEngine2/ChangeLog Wed Aug 1 01:31:27 2007 @@ -1,3 +1,16 @@ +2007-07-31 Johannes Schlüter [EMAIL PROTECTED] + +* (PHP_5_2) + zend_builtin_functions.c + tests/017.phpt: + - MFH: Add additional param to get_loaded_extensions() for returning Zend +extensions (Fixes #41278) [DOC] + +* zend_builtin_functions.c + tests/017.phpt: + - Add additional param to get_loaded_extensions() for returning Zend +extensions (Fixes #41278) + 2007-07-27 Dmitry Stogov [EMAIL PROTECTED] * zend_constants.c @@ -18570,7 +18583,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1149 2007/07/28 01:34:20 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1150 2007/08/01 01:31:27 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -20294,7 +20307,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1149 2007/07/28 01:34:20 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1150 2007/08/01 01:31:27 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings bug40754.phpt
tony2001Tue Jul 31 07:09:08 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings bug40754.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug40754.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/strings/bug40754.phpt diff -u php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.2 php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.3 --- php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.2Fri Mar 9 10:04:59 2007 +++ php-src/ext/standard/tests/strings/bug40754.phptTue Jul 31 07:09:08 2007 @@ -28,7 +28,7 @@ ? --EXPECTF-- string(4) bcde -bool(false) +string(6) abcdex bool(false) bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring config.m4
tony2001Tue Jul 31 12:23:42 2007 UTC Modified files: /php-src/ext/mbstring config.m4 Log: fix typo it would be much better if Gentoo people send us this patch long ago instead of using their private patches. http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.65r2=1.66diff_format=u Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.65 php-src/ext/mbstring/config.m4:1.66 --- php-src/ext/mbstring/config.m4:1.65 Thu Dec 21 17:37:52 2006 +++ php-src/ext/mbstring/config.m4 Tue Jul 31 12:23:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.65 2006/12/21 17:37:52 masugata Exp $ +dnl $Id: config.m4,v 1.66 2007/07/31 12:23:42 tony2001 Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -251,7 +251,7 @@ ],[ AC_MSG_ERROR([Problem with libmbfl. Please check config.log for more information.]) ], [ - -LPHP_LIBMBFL/$PHP_LIBDIR + -L$PHP_LIBMBFL/$PHP_LIBDIR ]) fi ]) -- 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/mbstring config.m4
tony2001Tue Jul 31 12:23:50 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mbstring config.m4 Log: fix typo http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.9r2=1.58.2.4.2.10diff_format=u Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.9 php-src/ext/mbstring/config.m4:1.58.2.4.2.10 --- php-src/ext/mbstring/config.m4:1.58.2.4.2.9 Tue Jul 3 17:25:33 2007 +++ php-src/ext/mbstring/config.m4 Tue Jul 31 12:23:50 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.58.2.4.2.9 2007/07/03 17:25:33 sniper Exp $ +dnl $Id: config.m4,v 1.58.2.4.2.10 2007/07/31 12:23:50 tony2001 Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -270,7 +270,7 @@ ],[ AC_MSG_ERROR([Problem with libmbfl. Please check config.log for more information.]) ], [ - -LPHP_LIBMBFL/$PHP_LIBDIR + -L$PHP_LIBMBFL/$PHP_LIBDIR ]) fi ]) -- 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/interbase config.m4 /ext/odbc config.m4 /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_pgsql config.m4 /ext/snmp config.m4
janiTue Jul 31 13:02:01 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/interbase config.m4 /php-src/ext/odbc config.m4 /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_mysql config.m4 /php-src/ext/pdo_pgsql config.m4 /php-src/ext/snmp config.m4 Log: MFH: Fix some lib vs $PHP_LIBDIR issues http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/config.m4?r1=1.20.6.1r2=1.20.6.2diff_format=u Index: php-src/ext/interbase/config.m4 diff -u php-src/ext/interbase/config.m4:1.20.6.1 php-src/ext/interbase/config.m4:1.20.6.2 --- php-src/ext/interbase/config.m4:1.20.6.1Tue Jul 3 17:25:33 2007 +++ php-src/ext/interbase/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.20.6.1 2007/07/03 17:25:33 sniper Exp $ +dnl $Id: config.m4,v 1.20.6.2 2007/07/31 13:02:00 jani Exp $ dnl PHP_ARG_WITH(interbase,for InterBase support, @@ -12,7 +12,7 @@ IBASE_LIBDIR=/usr/interbase/lib else IBASE_INCDIR=$PHP_INTERBASE/include -IBASE_LIBDIR=$PHP_INTERBASE/lib +IBASE_LIBDIR=$PHP_INTERBASE/$PHP_LIBDIR fi PHP_CHECK_LIBRARY(fbclient, isc_detach_database, http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/config.m4?r1=1.78.2.2.2.3r2=1.78.2.2.2.4diff_format=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.78.2.2.2.3 php-src/ext/odbc/config.m4:1.78.2.2.2.4 --- php-src/ext/odbc/config.m4:1.78.2.2.2.3 Tue Jul 17 12:12:26 2007 +++ php-src/ext/odbc/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.78.2.2.2.3 2007/07/17 12:12:26 jani Exp $ +dnl $Id: config.m4,v 1.78.2.2.2.4 2007/07/31 13:02:00 jani Exp $ dnl AC_DEFUN([PHP_ODBC_CHECK_HEADER],[ @@ -136,7 +136,7 @@ PHP_SAPDB=/usr/local fi PHP_ADD_INCLUDE($PHP_SAPDB/incl) -PHP_ADD_LIBPATH($PHP_SAPDB/lib) +PHP_ADD_LIBPATH($PHP_SAPDB/$PHP_LIBDIR) PHP_ADD_LIBRARY(sqlod) ODBC_TYPE=sapdb AC_DEFINE(HAVE_SAPDB,1,[ ]) @@ -373,7 +373,7 @@ if test $PHP_IODBC = yes; then PHP_IODBC=/usr/local fi -PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/lib) +PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) PHP_ADD_INCLUDE($PHP_IODBC/include, 1) ODBC_TYPE=iodbc ODBC_INCLUDE=-I$PHP_IODBC/include http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.8.4.1r2=1.8.4.2diff_format=u Index: php-src/ext/pdo_firebird/config.m4 diff -u php-src/ext/pdo_firebird/config.m4:1.8.4.1 php-src/ext/pdo_firebird/config.m4:1.8.4.2 --- php-src/ext/pdo_firebird/config.m4:1.8.4.1 Tue Jul 3 17:25:35 2007 +++ php-src/ext/pdo_firebird/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.4.1 2007/07/03 17:25:35 sniper Exp $ +dnl $Id: config.m4,v 1.8.4.2 2007/07/31 13:02:00 jani Exp $ dnl if test $PHP_PDO != no; then @@ -14,7 +14,7 @@ FIREBIRD_LIBDIR=/opt/firebird/lib else FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include -FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/lib +FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR fi PHP_CHECK_LIBRARY(fbclient, isc_detach_database, http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.7.2.5r2=1.25.2.7.2.6diff_format=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.5 php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6 --- php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.5Tue Jul 3 17:25:35 2007 +++ php-src/ext/pdo_mysql/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.7.2.5 2007/07/03 17:25:35 sniper Exp $ +dnl $Id: config.m4,v 1.25.2.7.2.6 2007/07/31 13:02:00 jani Exp $ dnl if test $PHP_PDO != no; then @@ -78,10 +78,10 @@ else PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include fi -if test -r $PDO_MYSQL_DIR/lib/mysql; then - PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/lib/mysql +if test -r $PDO_MYSQL_DIR/$PHP_LIBDIR/mysql; then + PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR/mysql else - PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/lib + PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR fi if test -r $PDO_MYSQL_LIB_DIR; then http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.m4?r1=1.13.4.5r2=1.13.4.6diff_format=u Index: php-src/ext/pdo_pgsql/config.m4 diff -u php-src/ext/pdo_pgsql/config.m4:1.13.4.5 php-src/ext/pdo_pgsql/config.m4:1.13.4.6 --- php-src/ext/pdo_pgsql/config.m4:1.13.4.5Wed Jul 11 21:51:55 2007 +++ php-src/ext/pdo_pgsql/config.m4 Tue Jul 31 13:02:00 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13.4.5 2007/07/11 21:51:55 jani Exp $ +dnl $Id: config.m4,v 1.13.4.6 2007/07/31 13:02:00 jani Exp $ dnl if test $PHP_PDO != no; then @@ -43,7 +43,7 @@ fi done - for j in lib lib/pgsql lib/postgres lib/postgresql ; do + for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ; do if test -f $i/$j/libpq.so || test -f $i/$j/libpq.a; then
[PHP-CVS] cvs: php-src /ext/interbase config.m4 /ext/odbc config.m4 /ext/pdo_firebird config.m4 /ext/pdo_pgsql config.m4 /ext/snmp config.m4
janiTue Jul 31 13:01:42 2007 UTC Modified files: /php-src/ext/interbase config.m4 /php-src/ext/odbc config.m4 /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_pgsql config.m4 /php-src/ext/snmp config.m4 Log: - Fix some lib vs. $PHP_LIBDIR issues. http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/config.m4?r1=1.21r2=1.22diff_format=u Index: php-src/ext/interbase/config.m4 diff -u php-src/ext/interbase/config.m4:1.21 php-src/ext/interbase/config.m4:1.22 --- php-src/ext/interbase/config.m4:1.21Tue Jul 3 17:24:36 2007 +++ php-src/ext/interbase/config.m4 Tue Jul 31 13:01:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.21 2007/07/03 17:24:36 sniper Exp $ +dnl $Id: config.m4,v 1.22 2007/07/31 13:01:42 jani Exp $ dnl PHP_ARG_WITH(interbase,for InterBase support, @@ -12,7 +12,7 @@ IBASE_LIBDIR=/usr/interbase/lib else IBASE_INCDIR=$PHP_INTERBASE/include -IBASE_LIBDIR=$PHP_INTERBASE/lib +IBASE_LIBDIR=$PHP_INTERBASE/$PHP_LIBDIR fi PHP_CHECK_LIBRARY(fbclient, isc_detach_database, http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/config.m4?r1=1.82r2=1.83diff_format=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.82 php-src/ext/odbc/config.m4:1.83 --- php-src/ext/odbc/config.m4:1.82 Tue Jul 17 12:11:41 2007 +++ php-src/ext/odbc/config.m4 Tue Jul 31 13:01:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.82 2007/07/17 12:11:41 jani Exp $ +dnl $Id: config.m4,v 1.83 2007/07/31 13:01:42 jani Exp $ dnl AC_DEFUN([PHP_ODBC_CHECK_HEADER],[ @@ -136,7 +136,7 @@ PHP_SAPDB=/usr/local fi PHP_ADD_INCLUDE($PHP_SAPDB/incl) -PHP_ADD_LIBPATH($PHP_SAPDB/lib) +PHP_ADD_LIBPATH($PHP_SAPDB/$PHP_LIBDIR) PHP_ADD_LIBRARY(sqlod) ODBC_TYPE=sapdb AC_DEFINE(HAVE_SAPDB,1,[ ]) @@ -373,7 +373,7 @@ if test $PHP_IODBC = yes; then PHP_IODBC=/usr/local fi -PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/lib) +PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) PHP_ADD_INCLUDE($PHP_IODBC/include, 1) ODBC_TYPE=iodbc ODBC_INCLUDE=-I$PHP_IODBC/include http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.9r2=1.10diff_format=u Index: php-src/ext/pdo_firebird/config.m4 diff -u php-src/ext/pdo_firebird/config.m4:1.9 php-src/ext/pdo_firebird/config.m4:1.10 --- php-src/ext/pdo_firebird/config.m4:1.9 Tue Jul 3 17:24:37 2007 +++ php-src/ext/pdo_firebird/config.m4 Tue Jul 31 13:01:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.9 2007/07/03 17:24:37 sniper Exp $ +dnl $Id: config.m4,v 1.10 2007/07/31 13:01:42 jani Exp $ dnl if test $PHP_PDO != no; then @@ -14,7 +14,7 @@ FIREBIRD_LIBDIR=/opt/firebird/lib else FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include -FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/lib +FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR fi PHP_CHECK_LIBRARY(fbclient, isc_detach_database, http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.m4?r1=1.18r2=1.19diff_format=u Index: php-src/ext/pdo_pgsql/config.m4 diff -u php-src/ext/pdo_pgsql/config.m4:1.18 php-src/ext/pdo_pgsql/config.m4:1.19 --- php-src/ext/pdo_pgsql/config.m4:1.18Wed Jul 11 21:51:10 2007 +++ php-src/ext/pdo_pgsql/config.m4 Tue Jul 31 13:01:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.18 2007/07/11 21:51:10 jani Exp $ +dnl $Id: config.m4,v 1.19 2007/07/31 13:01:42 jani Exp $ dnl if test $PHP_PDO != no; then @@ -43,7 +43,7 @@ fi done - for j in lib lib/pgsql lib/postgres lib/postgresql ; do + for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ; do if test -f $i/$j/libpq.so || test -f $i/$j/libpq.a; then PGSQL_LIBDIR=$i/$j fi http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/config.m4?r1=1.35r2=1.36diff_format=u Index: php-src/ext/snmp/config.m4 diff -u php-src/ext/snmp/config.m4:1.35 php-src/ext/snmp/config.m4:1.36 --- php-src/ext/snmp/config.m4:1.35 Wed Jul 11 08:47:31 2007 +++ php-src/ext/snmp/config.m4 Tue Jul 31 13:01:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.35 2007/07/11 08:47:31 jani Exp $ +dnl $Id: config.m4,v 1.36 2007/07/31 13:01:42 jani Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -48,8 +48,8 @@ test -f $i/snmp/snmp.h SNMP_INCDIR=$i/snmp test -f $i/snmp/include/ucd-snmp/snmp.h SNMP_INCDIR=$i/snmp/include/ucd-snmp done - for i in /usr /usr/snmp /usr/local /usr/local/snmp; do -test -f $i/lib/libsnmp.a || test -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME SNMP_LIBDIR=$i/lib + for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do +test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME SNMP_LIBDIR=$i done else SNMP_INCDIR=$PHP_SNMP/include -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit:
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
rrichards Tue Jul 31 15:07:15 2007 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
fix possible crash
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.241r2=1.242diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.241
php-src/ext/simplexml/simplexml.c:1.242
--- php-src/ext/simplexml/simplexml.c:1.241 Tue Jul 10 12:26:37 2007
+++ php-src/ext/simplexml/simplexml.c Tue Jul 31 15:07:15 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.241 2007/07/10 12:26:37 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.242 2007/07/31 15:07:15 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1637,7 +1637,9 @@
newnode-ns = NULL;
nsptr = xmlNewNs(newnode, (xmlChar *)nsuri, prefix);
} else {
- nsptr = xmlSearchNsByHref(node-doc, node, (xmlChar
*)nsuri);
+ if (node) {
+ nsptr = xmlSearchNsByHref(node-doc, node,
(xmlChar *)nsuri);
+ }
if (nsptr == NULL) {
nsptr = xmlNewNs(newnode, (xmlChar *)nsuri,
prefix);
}
@@ -2498,7 +2500,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.241 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.242 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
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/simplexml simplexml.c
rrichards Tue Jul 31 15:07:54 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/simplexml simplexml.c
Log:
MFH: fix possible crash
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.33r2=1.151.2.22.2.34diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.33
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.34
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.33 Tue Jul 10 12:24:51 2007
+++ php-src/ext/simplexml/simplexml.c Tue Jul 31 15:07:54 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.33 2007/07/10 12:24:51 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.34 2007/07/31 15:07:54 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1575,7 +1575,9 @@
newnode-ns = NULL;
nsptr = xmlNewNs(newnode, (xmlChar *)nsuri, prefix);
} else {
- nsptr = xmlSearchNsByHref(node-doc, node, (xmlChar
*)nsuri);
+ if (node) {
+ nsptr = xmlSearchNsByHref(node-doc, node,
(xmlChar *)nsuri);
+ }
if (nsptr == NULL) {
nsptr = xmlNewNs(newnode, (xmlChar *)nsuri,
prefix);
}
@@ -2435,7 +2437,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.33 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.34 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
rrichards Tue Jul 31 15:40:00 2007 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
fix bug #41833 (addChild() on a non-existent node, no node created, getName()
segfaults)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.242r2=1.243diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.242
php-src/ext/simplexml/simplexml.c:1.243
--- php-src/ext/simplexml/simplexml.c:1.242 Tue Jul 31 15:07:15 2007
+++ php-src/ext/simplexml/simplexml.c Tue Jul 31 15:39:59 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.242 2007/07/31 15:07:15 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.243 2007/07/31 15:39:59 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1625,6 +1625,11 @@
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
+ if (node == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot add child.
Parent is not a permanent member of the XML tree);
+ return;
+ }
+
localname = xmlSplitQName2((xmlChar *)qname, prefix);
if (localname == NULL) {
localname = xmlStrdup((xmlChar *)qname);
@@ -1637,9 +1642,7 @@
newnode-ns = NULL;
nsptr = xmlNewNs(newnode, (xmlChar *)nsuri, prefix);
} else {
- if (node) {
- nsptr = xmlSearchNsByHref(node-doc, node,
(xmlChar *)nsuri);
- }
+ nsptr = xmlSearchNsByHref(node-doc, node, (xmlChar
*)nsuri);
if (nsptr == NULL) {
nsptr = xmlNewNs(newnode, (xmlChar *)nsuri,
prefix);
}
@@ -2500,7 +2503,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.242 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.243 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
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/simplexml simplexml.c
rrichards Tue Jul 31 15:40:49 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/simplexml simplexml.c
Log:
MFH: fix bug #41833 (addChild() on a non-existent node, no node created,
getName() segfaults)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.34r2=1.151.2.22.2.35diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.34
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.34 Tue Jul 31 15:07:54 2007
+++ php-src/ext/simplexml/simplexml.c Tue Jul 31 15:40:49 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.34 2007/07/31 15:07:54 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35 2007/07/31 15:40:49 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1563,6 +1563,11 @@
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
+ if (node == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot add child.
Parent is not a permanent member of the XML tree);
+ return;
+ }
+
localname = xmlSplitQName2((xmlChar *)qname, prefix);
if (localname == NULL) {
localname = xmlStrdup((xmlChar *)qname);
@@ -1575,9 +1580,7 @@
newnode-ns = NULL;
nsptr = xmlNewNs(newnode, (xmlChar *)nsuri, prefix);
} else {
- if (node) {
- nsptr = xmlSearchNsByHref(node-doc, node,
(xmlChar *)nsuri);
- }
+ nsptr = xmlSearchNsByHref(node-doc, node, (xmlChar
*)nsuri);
if (nsptr == NULL) {
nsptr = xmlNewNs(newnode, (xmlChar *)nsuri,
prefix);
}
@@ -2437,7 +2440,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.34 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.35 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
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
rrichards Tue Jul 31 15:41:32 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.865r2=1.2027.2.547.2.866diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.865 php-src/NEWS:1.2027.2.547.2.866 --- php-src/NEWS:1.2027.2.547.2.865 Mon Jul 30 14:22:06 2007 +++ php-src/NEWSTue Jul 31 15:41:31 2007 @@ -112,6 +112,8 @@ years -0001 to -0999). (Derick) - Fixed bug #41842 (Cannot create years 0100 negative years with date_create or new DateTime). (Derick) +- Fixed bug #41833 (addChild() on a non-existent node, no node created, + getName() segfaults). (Rob) - Fixed bug #41815 (Concurrent read/write fails when EOF is reached). (Sascha) - Fixed bug #41813 (segmentation fault when using string offset as an object). (judas dot iscariote at gmail dot com, Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.namespaces
sebastian Tue Jul 31 16:03:45 2007 UTC Modified files: /php-srcREADME.namespaces Log: Add ext/tokenizer support to the TODO. http://cvs.php.net/viewvc.cgi/php-src/README.namespaces?r1=1.2r2=1.3diff_format=u Index: php-src/README.namespaces diff -u php-src/README.namespaces:1.2 php-src/README.namespaces:1.3 --- php-src/README.namespaces:1.2 Mon Jul 30 16:20:46 2007 +++ php-src/README.namespaces Tue Jul 31 16:03:45 2007 @@ -121,3 +121,5 @@ + getFiles() * Add getNamespace() methods to ReflectionClass and ReflectionFunction + +* Make ext/tokenizer package-aware -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c oci8_collection.c oci8_interface.c oci8_lob.c oci8_statement.c php_oci8_int.h
tony2001Tue Jul 31 19:19:40 2007 UTC Modified files: /php-src/ext/oci8 oci8.c oci8_collection.c oci8_interface.c oci8_lob.c oci8_statement.c php_oci8_int.h Log: fix #42134 (oci_error() returns false after oci_new_collection() fails) http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.333r2=1.334diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.333 php-src/ext/oci8/oci8.c:1.334 --- php-src/ext/oci8/oci8.c:1.333 Wed Jul 18 15:09:37 2007 +++ php-src/ext/oci8/oci8.c Tue Jul 31 19:19:39 2007 @@ -26,7 +26,7 @@ +--+ */ -/* $Id: oci8.c,v 1.333 2007/07/18 15:09:37 sixd Exp $ */ +/* $Id: oci8.c,v 1.334 2007/07/31 19:19:39 tony2001 Exp $ */ /* TODO * * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() with OCI_ATTR_LOBEMPTY @@ -674,7 +674,7 @@ php_info_print_table_start(); php_info_print_table_row(2, OCI8 Support, enabled); php_info_print_table_row(2, Version, 1.2.2); - php_info_print_table_row(2, Revision, $Revision: 1.333 $); + php_info_print_table_row(2, Revision, $Revision: 1.334 $); snprintf(buf, sizeof(buf), %ld, OCI_G(num_persistent)); php_info_print_table_row(2, Active Persistent Connections, buf); @@ -1895,3 +1895,12 @@ #endif #endif /* HAVE_OCI8 */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_collection.c?r1=1.14r2=1.15diff_format=u Index: php-src/ext/oci8/oci8_collection.c diff -u php-src/ext/oci8/oci8_collection.c:1.14 php-src/ext/oci8/oci8_collection.c:1.15 --- php-src/ext/oci8/oci8_collection.c:1.14 Wed Jul 18 15:09:37 2007 +++ php-src/ext/oci8/oci8_collection.c Tue Jul 31 19:19:39 2007 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: oci8_collection.c,v 1.14 2007/07/18 15:09:37 sixd Exp $ */ +/* $Id: oci8_collection.c,v 1.15 2007/07/31 19:19:39 tony2001 Exp $ */ @@ -55,7 +55,8 @@ collection-connection = connection; collection-collection = NULL; - + zend_list_addref(collection-connection-rsrc_id); + /* get type handle by name */ PHP_OCI_CALL_RETURN(connection-errcode, OCITypeByName, ( @@ -761,3 +762,12 @@ } /* }}} */ #endif /* HAVE_OCI8 */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.30r2=1.31diff_format=u Index: php-src/ext/oci8/oci8_interface.c diff -u php-src/ext/oci8/oci8_interface.c:1.30 php-src/ext/oci8/oci8_interface.c:1.31 --- php-src/ext/oci8/oci8_interface.c:1.30 Thu Jan 11 11:58:34 2007 +++ php-src/ext/oci8/oci8_interface.c Tue Jul 31 19:19:39 2007 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: oci8_interface.c,v 1.30 2007/01/11 11:58:34 tony2001 Exp $ */ +/* $Id: oci8_interface.c,v 1.31 2007/07/31 19:19:39 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2208,3 +2208,12 @@ #endif #endif /* HAVE_OCI8 */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.29r2=1.30diff_format=u Index: php-src/ext/oci8/oci8_lob.c diff -u php-src/ext/oci8/oci8_lob.c:1.29 php-src/ext/oci8/oci8_lob.c:1.30 --- php-src/ext/oci8/oci8_lob.c:1.29Wed Jul 18 15:09:37 2007 +++ php-src/ext/oci8/oci8_lob.c Tue Jul 31 19:19:39 2007 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: oci8_lob.c,v 1.29 2007/07/18 15:09:37 sixd Exp $ */ +/* $Id: oci8_lob.c,v 1.30 2007/07/31 19:19:39 tony2001 Exp $ */ @@ -69,6 +69,8 @@ descriptor = ecalloc(1, sizeof(php_oci_descriptor)); descriptor-type = type; + descriptor-connection = connection; + zend_list_addref(descriptor-connection-rsrc_id); PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIDescriptorAlloc, (connection-env, (dvoid*)(descriptor-descriptor), descriptor-type, (size_t) 0, (dvoid **) 0)); @@ -79,8 +81,6 @@ return NULL; } - descriptor-connection = connection; - PHP_OCI_REGISTER_RESOURCE(descriptor, le_descriptor); descriptor-lob_current_position = 0; @@ -940,3 +940,12 @@ /* }}} */ #endif /* HAVE_OCI8 */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.48r2=1.49diff_format=u
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/oci8 oci8.c oci8_collection.c oci8_interface.c oci8_lob.c oci8_statement.c php_oci8_int.h
tony2001Tue Jul 31 19:21:08 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/oci8 oci8.c oci8_collection.c oci8_interface.c oci8_lob.c oci8_statement.c php_oci8_int.h Log: MFH: fix #42134 (oci_error() returns false after oci_new_collection() fails) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.866r2=1.2027.2.547.2.867diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.866 php-src/NEWS:1.2027.2.547.2.867 --- php-src/NEWS:1.2027.2.547.2.866 Tue Jul 31 15:41:31 2007 +++ php-src/NEWSTue Jul 31 19:21:08 2007 @@ -74,6 +74,8 @@ length). (Ilia) - Fixed bug #42135 (Second call of session_start() causes creation of SID). (Ilia) +- Fixed bug #42134 (oci_error() returns false after oci_new_collection() + fails). (Tony) - Fixed Bug #42112 (deleting a node produces memory corruption). (Rob) - Fixed Bug #42107 (sscanf broken when using %2$s format parameters). (Jani) - Fixed bug #42090 (json_decode causes segmentation fault). (Hannes) http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.34r2=1.269.2.16.2.35diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.34 php-src/ext/oci8/oci8.c:1.269.2.16.2.35 --- php-src/ext/oci8/oci8.c:1.269.2.16.2.34 Wed Jul 18 15:10:42 2007 +++ php-src/ext/oci8/oci8.c Tue Jul 31 19:21:08 2007 @@ -26,7 +26,7 @@ +--+ */ -/* $Id: oci8.c,v 1.269.2.16.2.34 2007/07/18 15:10:42 sixd Exp $ */ +/* $Id: oci8.c,v 1.269.2.16.2.35 2007/07/31 19:21:08 tony2001 Exp $ */ /* TODO * * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() with OCI_ATTR_LOBEMPTY @@ -674,7 +674,7 @@ php_info_print_table_start(); php_info_print_table_row(2, OCI8 Support, enabled); php_info_print_table_row(2, Version, 1.2.3); - php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.34 $); + php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.35 $); snprintf(buf, sizeof(buf), %ld, OCI_G(num_persistent)); php_info_print_table_row(2, Active Persistent Connections, buf); @@ -1832,3 +1832,12 @@ #endif #endif /* HAVE_OCI8 */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_collection.c?r1=1.5.2.3.2.6r2=1.5.2.3.2.7diff_format=u Index: php-src/ext/oci8/oci8_collection.c diff -u php-src/ext/oci8/oci8_collection.c:1.5.2.3.2.6 php-src/ext/oci8/oci8_collection.c:1.5.2.3.2.7 --- php-src/ext/oci8/oci8_collection.c:1.5.2.3.2.6 Wed Jul 18 15:10:42 2007 +++ php-src/ext/oci8/oci8_collection.c Tue Jul 31 19:21:08 2007 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: oci8_collection.c,v 1.5.2.3.2.6 2007/07/18 15:10:42 sixd Exp $ */ +/* $Id: oci8_collection.c,v 1.5.2.3.2.7 2007/07/31 19:21:08 tony2001 Exp $ */ @@ -55,7 +55,8 @@ collection-connection = connection; collection-collection = NULL; - + zend_list_addref(collection-connection-rsrc_id); + /* get type handle by name */ PHP_OCI_CALL_RETURN(connection-errcode, OCITypeByName, ( @@ -741,3 +742,12 @@ } /* }}} */ #endif /* HAVE_OCI8 */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.7.2.10r2=1.8.2.7.2.11diff_format=u Index: php-src/ext/oci8/oci8_interface.c diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.10 php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.11 --- php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.10 Wed Jul 18 15:10:42 2007 +++ php-src/ext/oci8/oci8_interface.c Tue Jul 31 19:21:08 2007 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: oci8_interface.c,v 1.8.2.7.2.10 2007/07/18 15:10:42 sixd Exp $ */ +/* $Id: oci8_interface.c,v 1.8.2.7.2.11 2007/07/31 19:21:08 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2169,3 +2169,12 @@ #endif #endif /* HAVE_OCI8 */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.7.2.6.2.13r2=1.7.2.6.2.14diff_format=u Index: php-src/ext/oci8/oci8_lob.c diff -u php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.13 php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14 --- php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.13Wed Jul 18 15:10:42 2007 +++ php-src/ext/oci8/oci8_lob.c Tue Jul 31 19:21:08 2007 @@ -25,7 +25,7 @@ +--+ */ -/*
[PHP-CVS] cvs: php-src /ext/oci8 oci8_interface.c
tony2001Tue Jul 31 21:08:38 2007 UTC
Modified files:
/php-src/ext/oci8 oci8_interface.c
Log:
missing part of the fix for bug #42134
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.31r2=1.32diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.31
php-src/ext/oci8/oci8_interface.c:1.32
--- php-src/ext/oci8/oci8_interface.c:1.31 Tue Jul 31 19:19:39 2007
+++ php-src/ext/oci8/oci8_interface.c Tue Jul 31 21:08:38 2007
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_interface.c,v 1.31 2007/07/31 19:19:39 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.32 2007/07/31 21:08:38 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1622,19 +1622,28 @@
RETURN_FALSE;
}
#endif
- } else {
- connection = (php_oci_connection *)
zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_connection);
-
- if (connection) {
- errh = connection-err;
- error = connection-errcode;
- }
+ goto go_out;
+ }
+
+ connection = (php_oci_connection *) zend_fetch_resource(arg
TSRMLS_CC, -1, NULL, NULL, 1, le_connection);
+ if (connection) {
+ errh = connection-err;
+ error = connection-errcode;
+ goto go_out;
+ }
+
+ connection = (php_oci_connection *) zend_fetch_resource(arg
TSRMLS_CC, -1, NULL, NULL, 1, le_pconnection);
+ if (connection) {
+ errh = connection-err;
+ error = connection-errcode;
+ goto go_out;
}
} else {
errh = OCI_G(err);
error = OCI_G(errcode);
}
+go_out:
if (error == OCI_SUCCESS) { /* no error set in the handle */
RETURN_FALSE;
}
--
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/oci8 oci8_interface.c
tony2001Tue Jul 31 21:09:01 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 oci8_interface.c
Log:
MFH: missing part of the fix for bug #42134
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.7.2.11r2=1.8.2.7.2.12diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.11
php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.12
--- php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.11 Tue Jul 31 19:21:08 2007
+++ php-src/ext/oci8/oci8_interface.c Tue Jul 31 21:09:01 2007
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_interface.c,v 1.8.2.7.2.11 2007/07/31 19:21:08 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.8.2.7.2.12 2007/07/31 21:09:01 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1583,19 +1583,28 @@
RETURN_FALSE;
}
#endif
- } else {
- connection = (php_oci_connection *)
zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_connection);
-
- if (connection) {
- errh = connection-err;
- error = connection-errcode;
- }
+ goto go_out;
+ }
+
+ connection = (php_oci_connection *) zend_fetch_resource(arg
TSRMLS_CC, -1, NULL, NULL, 1, le_connection);
+ if (connection) {
+ errh = connection-err;
+ error = connection-errcode;
+ goto go_out;
+ }
+
+ connection = (php_oci_connection *) zend_fetch_resource(arg
TSRMLS_CC, -1, NULL, NULL, 1, le_pconnection);
+ if (connection) {
+ errh = connection-err;
+ error = connection-errcode;
+ goto go_out;
}
} else {
errh = OCI_G(err);
error = OCI_G(errcode);
}
+go_out:
if (error == OCI_SUCCESS) { /* no error set in the handle */
RETURN_FALSE;
}
--
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/oci8/tests bug42134.phpt
tony2001Tue Jul 31 21:11:33 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/oci8/tests bug42134.phpt
Log:
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bug42134.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/bug42134.phpt
+++ php-src/ext/oci8/tests/bug42134.phpt
--TEST--
Bug #42134 (Collection error for invalid collection name)
--SKIPIF--
?php if (!extension_loaded('oci8')) die(skip no oci8 extension); ?
--FILE--
?php
require(dirname(__FILE__).'/details.inc');
// Test collection creation error for normal connection
if (!empty($dbase)) {
$c = oci_connect($user,$password,$dbase);
}
else {
$c = oci_connect($user,$password);
}
$collection = oci_new_collection($c, ABC);
if (!$collection) {
echo Normal connection: New Collection error\n;
$m = oci_error($c);
var_dump($m);
}
// Test collection creation error for new connection
if (!empty($dbase)) {
$c = oci_new_connect($user,$password,$dbase);
}
else {
$c = oci_new_connect($user,$password);
}
$collection = oci_new_collection($c, DEF);
if (!$collection) {
echo New connection: New Collection error\n;
$m = oci_error($c);
var_dump($m);
}
// Test collection creation error for persistent connection
if (!empty($dbase)) {
$c = oci_pconnect($user,$password,$dbase);
}
else {
$c = oci_pconnect($user,$password);
}
$collection = oci_new_collection($c, GHI);
if (!$collection) {
echo Persistent connection: New Collection error\n;
$m = oci_error($c);
var_dump($m);
}
echo Done\n;
?
--EXPECTF--
Warning: oci_new_collection(): OCI-22303: type .ABC not found in %s on line
%d
Normal connection: New Collection error
array(4) {
[code]=
int(22303)
[message]=
string(34) OCI-22303: type .ABC not found
[offset]=
int(0)
[sqltext]=
string(0)
}
Warning: oci_new_collection(): OCI-22303: type .DEF not found in %s on line
%d
New connection: New Collection error
array(4) {
[code]=
int(22303)
[message]=
string(34) OCI-22303: type .DEF not found
[offset]=
int(0)
[sqltext]=
string(0)
}
Warning: oci_new_collection(): OCI-22303: type .GHI not found in %s on line
%d
Persistent connection: New Collection error
array(4) {
[code]=
int(22303)
[message]=
string(34) OCI-22303: type .GHI not found
[offset]=
int(0)
[sqltext]=
string(0)
}
Done
--UEXPECTF--
Warning: oci_new_collection(): OCI-22303: type .ABC not found in %s on line
%d
Normal connection: New Collection error
array(4) {
[ucode]=
int(22303)
[umessage]=
unicode(34) OCI-22303: type .ABC not found
[uoffset]=
int(0)
[usqltext]=
unicode(0)
}
Warning: oci_new_collection(): OCI-22303: type .DEF not found in %s on line
%d
New connection: New Collection error
array(4) {
[ucode]=
int(22303)
[umessage]=
unicode(34) OCI-22303: type .DEF not found
[uoffset]=
int(0)
[usqltext]=
unicode(0)
}
Warning: oci_new_collection(): OCI-22303: type .GHI not found in %s on line
%d
Persistent connection: New Collection error
array(4) {
[ucode]=
int(22303)
[umessage]=
unicode(34) OCI-22303: type .GHI not found
[uoffset]=
int(0)
[usqltext]=
unicode(0)
}
Done
--
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
janiTue Jul 31 21:29:11 2007 UTC
Modified files:
/php-srcrun-tests.php
Log:
- Allow using * in test filenames to match pattern
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.328r2=1.329diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.328 php-src/run-tests.php:1.329
--- php-src/run-tests.php:1.328 Wed Jul 4 10:15:47 2007
+++ php-src/run-tests.php Tue Jul 31 21:29:11 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.328 2007/07/04 10:15:47 dmitry Exp $ */
+/* $Id: run-tests.php,v 1.329 2007/07/31 21:29:11 jani 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
@@ -407,7 +407,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.328 $'.\n;
+ echo '$Revision: 1.329 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -481,7 +481,18 @@
}
if (!$is_switch) {
$testfile = realpath($argv[$i]);
- if (is_dir($testfile)) {
+ if (!$testfile strpos($argv[$i], '*') !== false
function_exists('glob')) {
+ if (preg_match(/\.phpt$/, $argv[$i])) {
+ $pattern_match = glob($argv[$i]);
+ } else if (preg_match(/\*$/, $argv[$i])) {
+ $pattern_match = glob($argv[$i] .
'.phpt');
+ } else {
+ die(bogus test name . $argv[$i] .
\n);
+ }
+ if (is_array($pattern_match)) {
+ $test_files = array_merge($test_files,
$pattern_match);
+ }
+ } else if (is_dir($testfile)) {
find_files($testfile);
} else if (preg_match(/\.phpt$/, $testfile)) {
$test_files[] = $testfile;
--
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) / run-tests.php
janiTue Jul 31 21:29:21 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
MFH:- Allow using * in test filenames to match pattern
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.33r2=1.226.2.37.2.34diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.33
php-src/run-tests.php:1.226.2.37.2.34
--- php-src/run-tests.php:1.226.2.37.2.33 Thu Jul 26 22:45:59 2007
+++ php-src/run-tests.php Tue Jul 31 21:29:21 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.33 2007/07/26 22:45:59 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.34 2007/07/31 21:29:21 jani 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
@@ -399,7 +399,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.33
$'.\n;
+ echo '$Revision: 1.226.2.37.2.34
$'.\n;
exit(1);
case 'u':
@@ -474,7 +474,18 @@
}
if (!$is_switch) {
$testfile = realpath($argv[$i]);
- if (is_dir($testfile)) {
+ if (!$testfile strpos($argv[$i], '*') !== false
function_exists('glob')) {
+ if (preg_match(/\.phpt$/, $argv[$i])) {
+ $pattern_match = glob($argv[$i]);
+ } else if (preg_match(/\*$/, $argv[$i])) {
+ $pattern_match = glob($argv[$i] .
'.phpt');
+ } else {
+ die(bogus test name . $argv[$i] .
\n);
+ }
+ if (is_array($pattern_match)) {
+ $test_files = array_merge($test_files,
$pattern_match);
+ }
+ } else if (is_dir($testfile)) {
find_files($testfile);
} else if (preg_match(/\.phpt$/, $testfile)) {
$test_files[] = $testfile;
--
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
johannesTue Jul 31 22:47:43 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.867r2=1.2027.2.547.2.868diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.867 php-src/NEWS:1.2027.2.547.2.868
--- php-src/NEWS:1.2027.2.547.2.867 Tue Jul 31 19:21:08 2007
+++ php-src/NEWSTue Jul 31 22:47:43 2007
@@ -185,6 +185,8 @@
copying). (Dmitry)
- Fixed bug #41350 (my_thread_global_end() error during request shutdown
on Windows). (Scott, Andrey)
+- Fixed bug #41278 (get_loaded_extensions() should list Zend extensions).
+ (Johannes)
- Fixed bug #41127 (Memory leak in ldap_{first|next}_attribute functions).
(Jani)
- Fixed bug #40757 (get_object_vars get nothing in child class). (Dmitry)
--
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/pdo pdo_stmt.c
iliaa Tue Jul 31 22:48:43 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdopdo_stmt.c
/php-srcNEWS
Log:
Fixed bug #41971 (PDOStatement::fetch and PDOStatement::setFetchMode causes
unexpected behavior).
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.21r2=1.118.2.38.2.22diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.21
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.22
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.21 Sun Jul 22 15:50:17 2007
+++ php-src/ext/pdo/pdo_stmt.c Tue Jul 31 22:48:42 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.21 2007/07/22 15:50:17 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.22 2007/07/31 22:48:42 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -867,10 +867,10 @@
zend_class_entry *ce = NULL, *old_ce = NULL;
zval grp_val, *grp, **pgrp, *retval, *old_ctor_args = NULL;
- how = how ~PDO_FETCH_FLAGS;
if (how == PDO_FETCH_USE_DEFAULT) {
how = stmt-default_fetch_type;
}
+ how = how ~PDO_FETCH_FLAGS;
if (!do_fetch_common(stmt, ori, offset, do_bind TSRMLS_CC)) {
return 0;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.868r2=1.2027.2.547.2.869diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.868 php-src/NEWS:1.2027.2.547.2.869
--- php-src/NEWS:1.2027.2.547.2.868 Tue Jul 31 22:47:43 2007
+++ php-src/NEWSTue Jul 31 22:48:42 2007
@@ -90,6 +90,8 @@
- Fixed bug #41989 (move_uploaded_file() relative path in ZTS mode). (Tony)
- Fixed bug #41984 (Hangs on large SoapClient requests). (Dmitry)
- Fixed bug #41983 (Error Fetching http headers terminated by '\n'). (Dmitry)
+- Fixed bug #41971 (PDOStatement::fetch and PDOStatement::setFetchMode causes
+ unexpected behavior). (Ilia)
- Fixed bug #41964 (strtotime returns a timestamp for non-time string of
pattern '(A|a) .+'). (Derick)
- Fixed bug #41961 (Ensure search for hidden private methods does not stray
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tokenizer CREDITS config.m4 php_tokenizer.h tokenizer.c tokenizer_data.c tokenizer_data_gen.sh
johannesTue Jul 31 23:23:37 2007 UTC
Added files:
/php-src/ext/tokenizer tokenizer_data.c tokenizer_data_gen.sh
Modified files:
/php-src/ext/tokenizer CREDITS config.m4 php_tokenizer.h
tokenizer.c
Log:
- Use a script to generate tokenizer data from zend_language_parser.h
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/CREDITS?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/tokenizer/CREDITS
diff -u php-src/ext/tokenizer/CREDITS:1.2 php-src/ext/tokenizer/CREDITS:1.3
--- php-src/ext/tokenizer/CREDITS:1.2 Sat Mar 2 13:44:06 2002
+++ php-src/ext/tokenizer/CREDITS Tue Jul 31 23:23:37 2007
@@ -1,2 +1,2 @@
tokenizer
-Andrei Zmievski
+Andrei Zmievski, Johannes Schlueter
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/config.m4?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/tokenizer/config.m4
diff -u php-src/ext/tokenizer/config.m4:1.5 php-src/ext/tokenizer/config.m4:1.6
--- php-src/ext/tokenizer/config.m4:1.5 Tue Apr 16 05:37:51 2002
+++ php-src/ext/tokenizer/config.m4 Tue Jul 31 23:23:37 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.5 2002/04/16 05:37:51 ssb Exp $
+dnl $Id: config.m4,v 1.6 2007/07/31 23:23:37 johannes Exp $
dnl config.m4 for extension tokenizer
dnl Otherwise use enable:
@@ -7,6 +7,6 @@
[ --disable-tokenizer Disable tokenizer support], yes)
if test $PHP_TOKENIZER != no; then
- PHP_NEW_EXTENSION(tokenizer, tokenizer.c, $ext_shared)
+ PHP_NEW_EXTENSION(tokenizer, tokenizer.c tokenizer_data.c, $ext_shared)
PHP_ADD_MAKEFILE_FRAGMENT
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/php_tokenizer.h?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/tokenizer/php_tokenizer.h
diff -u php-src/ext/tokenizer/php_tokenizer.h:1.13
php-src/ext/tokenizer/php_tokenizer.h:1.14
--- php-src/ext/tokenizer/php_tokenizer.h:1.13 Mon May 28 12:18:26 2007
+++ php-src/ext/tokenizer/php_tokenizer.h Tue Jul 31 23:23:37 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_tokenizer.h,v 1.13 2007/05/28 12:18:26 bjori Exp $ */
+/* $Id: php_tokenizer.h,v 1.14 2007/07/31 23:23:37 johannes Exp $ */
#ifndef PHP_TOKENIZER_H
#define PHP_TOKENIZER_H
@@ -34,6 +34,10 @@
#include TSRM.h
#endif
+void tokenizer_register_constants(INIT_FUNC_ARGS);
+char *get_token_type_name(int token_type);
+
+
PHP_MINIT_FUNCTION(tokenizer);
PHP_MINFO_FUNCTION(tokenizer);
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.42r2=1.43diff_format=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.42
php-src/ext/tokenizer/tokenizer.c:1.43
--- php-src/ext/tokenizer/tokenizer.c:1.42 Fri May 18 13:12:47 2007
+++ php-src/ext/tokenizer/tokenizer.c Tue Jul 31 23:23:37 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tokenizer.c,v 1.42 2007/05/18 13:12:47 dmitry Exp $ */
+/* $Id: tokenizer.c,v 1.43 2007/07/31 23:23:37 johannes Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -132,126 +132,7 @@
*/
PHP_MINIT_FUNCTION(tokenizer)
{
- REGISTER_LONG_CONSTANT(T_INCLUDE, T_INCLUDE, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_INCLUDE_ONCE, T_INCLUDE_ONCE, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_EVAL, T_EVAL, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_REQUIRE, T_REQUIRE, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_REQUIRE_ONCE, T_REQUIRE_ONCE, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_LOGICAL_OR, T_LOGICAL_OR, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_LOGICAL_XOR, T_LOGICAL_XOR, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_LOGICAL_AND, T_LOGICAL_AND, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_PRINT, T_PRINT, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_PLUS_EQUAL, T_PLUS_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_MINUS_EQUAL, T_MINUS_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_MUL_EQUAL, T_MUL_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_DIV_EQUAL, T_DIV_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_CONCAT_EQUAL, T_CONCAT_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_MOD_EQUAL, T_MOD_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_AND_EQUAL, T_AND_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_OR_EQUAL, T_OR_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_XOR_EQUAL, T_XOR_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_SL_EQUAL, T_SL_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_SR_EQUAL, T_SR_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_BOOLEAN_OR,
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/tokenizer CREDITS config.m4 php_tokenizer.h tokenizer.c tokenizer_data.c tokenizer_data_gen.sh
johannesTue Jul 31 23:24:11 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/tokenizer tokenizer_data.c tokenizer_data_gen.sh
Modified files:
/php-src/ext/tokenizer CREDITS config.m4 php_tokenizer.h
tokenizer.c
Log:
- MFH: Use a script to generate tokenizer data from zend_language_parser.h
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/CREDITS?r1=1.2r2=1.2.26.1diff_format=u
Index: php-src/ext/tokenizer/CREDITS
diff -u php-src/ext/tokenizer/CREDITS:1.2 php-src/ext/tokenizer/CREDITS:1.2.26.1
--- php-src/ext/tokenizer/CREDITS:1.2 Sat Mar 2 13:44:06 2002
+++ php-src/ext/tokenizer/CREDITS Tue Jul 31 23:24:11 2007
@@ -1,2 +1,2 @@
tokenizer
-Andrei Zmievski
+Andrei Zmievski, Johannes Schlueter
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/config.m4?r1=1.5r2=1.5.22.1diff_format=u
Index: php-src/ext/tokenizer/config.m4
diff -u php-src/ext/tokenizer/config.m4:1.5
php-src/ext/tokenizer/config.m4:1.5.22.1
--- php-src/ext/tokenizer/config.m4:1.5 Tue Apr 16 05:37:51 2002
+++ php-src/ext/tokenizer/config.m4 Tue Jul 31 23:24:11 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.5 2002/04/16 05:37:51 ssb Exp $
+dnl $Id: config.m4,v 1.5.22.1 2007/07/31 23:24:11 johannes Exp $
dnl config.m4 for extension tokenizer
dnl Otherwise use enable:
@@ -7,6 +7,6 @@
[ --disable-tokenizer Disable tokenizer support], yes)
if test $PHP_TOKENIZER != no; then
- PHP_NEW_EXTENSION(tokenizer, tokenizer.c, $ext_shared)
+ PHP_NEW_EXTENSION(tokenizer, tokenizer.c tokenizer_data.c, $ext_shared)
PHP_ADD_MAKEFILE_FRAGMENT
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/php_tokenizer.h?r1=1.9.2.1.2.3r2=1.9.2.1.2.4diff_format=u
Index: php-src/ext/tokenizer/php_tokenizer.h
diff -u php-src/ext/tokenizer/php_tokenizer.h:1.9.2.1.2.3
php-src/ext/tokenizer/php_tokenizer.h:1.9.2.1.2.4
--- php-src/ext/tokenizer/php_tokenizer.h:1.9.2.1.2.3 Mon May 28 12:19:41 2007
+++ php-src/ext/tokenizer/php_tokenizer.h Tue Jul 31 23:24:11 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_tokenizer.h,v 1.9.2.1.2.3 2007/05/28 12:19:41 bjori Exp $ */
+/* $Id: php_tokenizer.h,v 1.9.2.1.2.4 2007/07/31 23:24:11 johannes Exp $ */
#ifndef PHP_TOKENIZER_H
#define PHP_TOKENIZER_H
@@ -34,6 +34,10 @@
#include TSRM.h
#endif
+void tokenizer_register_constants(INIT_FUNC_ARGS);
+char *get_token_type_name(int token_type);
+
+
PHP_MINIT_FUNCTION(tokenizer);
PHP_MINFO_FUNCTION(tokenizer);
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.6r2=1.31.2.5.2.7diff_format=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.6
php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.6 Fri May 18 13:12:04 2007
+++ php-src/ext/tokenizer/tokenizer.c Tue Jul 31 23:24:11 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tokenizer.c,v 1.31.2.5.2.6 2007/05/18 13:12:04 dmitry Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.5.2.7 2007/07/31 23:24:11 johannes Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -132,126 +132,7 @@
*/
PHP_MINIT_FUNCTION(tokenizer)
{
- REGISTER_LONG_CONSTANT(T_INCLUDE, T_INCLUDE, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_INCLUDE_ONCE, T_INCLUDE_ONCE, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_EVAL, T_EVAL, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_REQUIRE, T_REQUIRE, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_REQUIRE_ONCE, T_REQUIRE_ONCE, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_LOGICAL_OR, T_LOGICAL_OR, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_LOGICAL_XOR, T_LOGICAL_XOR, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_LOGICAL_AND, T_LOGICAL_AND, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_PRINT, T_PRINT, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_PLUS_EQUAL, T_PLUS_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_MINUS_EQUAL, T_MINUS_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_MUL_EQUAL, T_MUL_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_DIV_EQUAL, T_DIV_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_CONCAT_EQUAL, T_CONCAT_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_MOD_EQUAL, T_MOD_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_AND_EQUAL, T_AND_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_OR_EQUAL, T_OR_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_XOR_EQUAL, T_XOR_EQUAL, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(T_SL_EQUAL, T_SL_EQUAL,
