[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Feb 28 20:40:40 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1908r2=1.1909ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1908 php-src/ChangeLog:1.1909 --- php-src/ChangeLog:1.1908Sun Feb 27 20:39:20 2005 +++ php-src/ChangeLog Mon Feb 28 20:40:38 2005 @@ -1,3 +1,42 @@ +2005-02-28 Ilia Alshanetsky [EMAIL PROTECTED] + +* php.ini-dist + php.ini-recommended: + Added notes about ignore_user_abort to php.ini* + +2005-02-28 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_builtin_functions.c: + - Add support for methods dynamically added through object handlers + +2005-02-28 Jani Taskinen [EMAIL PROTECTED] + +* NEWS: + reorder + +* (PHP_5_0) + NEWS: + typo + +2005-02-28 Stefan Esser [EMAIL PROTECTED] + +* ext/standard/var_unserializer.re: + This way around for correct error messages + +* ext/standard/var_unserializer.re: + Drop invalid arrays + +2005-02-28 Wez Furlong [EMAIL PROTECTED] + +* scripts/Makefile.frag: + Let's install the mbstring headers. + Fixes PECL #3516 + +2005-02-28 Marcus Boerger [EMAIL PROTECTED] + +* acinclude.m4: + - Fix typo + 2005-02-27 Marcus Boerger [EMAIL PROTECTED] * ext/simplexml/tests/016a.phpt @@ -909,7 +948,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.1908 2005/02/28 01:39:20 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.1909 2005/03/01 01:40:38 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -1390,7 +1429,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.1908 2005/02/28 01:39:20 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.1909 2005/03/01 01:40:38 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -2864,7 +2903,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.1908 2005/02/28 01:39:20 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.1909 2005/03/01 01:40:38 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Feb 28 20:41:21 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.647r2=1.648ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.647 ZendEngine2/ChangeLog:1.648 --- ZendEngine2/ChangeLog:1.647 Sun Feb 27 20:39:43 2005 +++ ZendEngine2/ChangeLog Mon Feb 28 20:41:19 2005 @@ -1,3 +1,8 @@ +2005-02-28 Marcus Boerger [EMAIL PROTECTED] + +* zend_builtin_functions.c: + - Add support for methods dynamically added through object handlers + 2005-02-27 Marcus Boerger [EMAIL PROTECTED] * zend_object_handlers.c: @@ -7220,7 +7225,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.647 2005/02/28 01:39:43 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.648 2005/03/01 01:41:19 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -8944,7 +8949,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.647 2005/02/28 01:39:43 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.648 2005/03/01 01:41:19 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
pajoye Mon Feb 28 03:13:36 2005 EDT Modified files: /php-src/ext/libxml libxml.c Log: - create LIBXML_VERSION and LIBXML_DOTTED_VERSION constants http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.29r2=1.30ty=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.29 php-src/ext/libxml/libxml.c:1.30 --- php-src/ext/libxml/libxml.c:1.29Sun Feb 20 16:49:45 2005 +++ php-src/ext/libxml/libxml.c Mon Feb 28 03:13:35 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: libxml.c,v 1.29 2005/02/20 21:49:45 rrichards Exp $ */ +/* $Id: libxml.c,v 1.30 2005/02/28 08:13:35 pajoye Exp $ */ #define IS_EXT_MODULE @@ -530,6 +530,8 @@ LIBXML(error_buffer).c = NULL; LIBXML(error_list) = NULL; #endif + REGISTER_LONG_CONSTANT(LIBXML_VERSION, LIBXML_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT(LIBXML_DOTTED_VERSION, LIBXML_DOTTED_VERSION, CONST_CS | CONST_PERSISTENT); #if LIBXML_VERSION = 20600 /* For use with loading xml */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_odbc config.m4 /ext/pdo_pgsql config.m4 /ext/pdo_sqlite config.m4
rasmus Mon Feb 28 03:18:47 2005 EDT Modified files: /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_mysql config.m4 /php-src/ext/pdo_ociconfig.m4 /php-src/ext/pdo_odbc config.m4 /php-src/ext/pdo_pgsql config.m4 /php-src/ext/pdo_sqlite config.m4 Log: If pdo is disabled, skip all the pdo extensions. http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/config.m4?r1=1.5r2=1.6ty=u Index: php-src/ext/pdo_firebird/config.m4 diff -u php-src/ext/pdo_firebird/config.m4:1.5 php-src/ext/pdo_firebird/config.m4:1.6 --- php-src/ext/pdo_firebird/config.m4:1.5 Wed Feb 23 12:44:22 2005 +++ php-src/ext/pdo_firebird/config.m4 Mon Feb 28 03:18:46 2005 @@ -1,7 +1,9 @@ dnl -dnl $Id: config.m4,v 1.5 2005/02/23 17:44:22 abies Exp $ +dnl $Id: config.m4,v 1.6 2005/02/28 08:18:46 rasmus Exp $ dnl +if test $PHP_PDO != no; then + PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO, [ --with-pdo-firebird[=DIR] Include Firebird support for PDO. DIR is the Firebird base install directory, defaults to /opt/firebird]) @@ -57,3 +59,5 @@ PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo) fi + +fi http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.18r2=1.19ty=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.18 php-src/ext/pdo_mysql/config.m4:1.19 --- php-src/ext/pdo_mysql/config.m4:1.18Wed Feb 16 23:23:14 2005 +++ php-src/ext/pdo_mysql/config.m4 Mon Feb 28 03:18:47 2005 @@ -1,7 +1,9 @@ dnl -dnl $Id: config.m4,v 1.18 2005/02/17 04:23:14 wez Exp $ +dnl $Id: config.m4,v 1.19 2005/02/28 08:18:47 rasmus Exp $ dnl +if test $PHP_PDO != no; then + AC_DEFUN([PDO_MYSQL_LIB_CHK], [ str=$PDO_MYSQL_DIR/$1/libmysqlclient.* for j in `echo $str`; do @@ -81,3 +83,5 @@ PHP_SUBST_OLD(PDO_MYSQL_LIBS) PHP_SUBST_OLD(PDO_MYSQL_INCLUDE) fi + +fi http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.10r2=1.11ty=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.10 php-src/ext/pdo_oci/config.m4:1.11 --- php-src/ext/pdo_oci/config.m4:1.10 Wed Feb 16 23:23:14 2005 +++ php-src/ext/pdo_oci/config.m4 Mon Feb 28 03:18:47 2005 @@ -1,4 +1,6 @@ -dnl $Id: config.m4,v 1.10 2005/02/17 04:23:14 wez Exp $ +dnl $Id: config.m4,v 1.11 2005/02/28 08:18:47 rasmus Exp $ + +if test $PHP_PDO != no; then AC_DEFUN([AC_PDO_OCI_VERSION],[ AC_MSG_CHECKING([Oracle version]) @@ -180,3 +182,5 @@ PHP_ADD_EXTENSION_DEP(pdo_oci, pdo) fi + +fi http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/config.m4?r1=1.14r2=1.15ty=u Index: php-src/ext/pdo_odbc/config.m4 diff -u php-src/ext/pdo_odbc/config.m4:1.14 php-src/ext/pdo_odbc/config.m4:1.15 --- php-src/ext/pdo_odbc/config.m4:1.14 Wed Feb 16 23:23:14 2005 +++ php-src/ext/pdo_odbc/config.m4 Mon Feb 28 03:18:47 2005 @@ -1,7 +1,9 @@ -dnl $Id: config.m4,v 1.14 2005/02/17 04:23:14 wez Exp $ +dnl $Id: config.m4,v 1.15 2005/02/28 08:18:47 rasmus Exp $ dnl config.m4 for extension pdo_odbc dnl vim:et:sw=2:ts=2: +if test $PHP_PDO != no; then + AC_DEFUN([PDO_ODBC_HELP_TEXT], [[ --with-pdo-odbc=flavour,dir Add support for flavour ODBC drivers, looking for include and lib dirs under dir @@ -147,3 +149,4 @@ PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo) fi +fi http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/config.m4?r1=1.6r2=1.7ty=u Index: php-src/ext/pdo_pgsql/config.m4 diff -u php-src/ext/pdo_pgsql/config.m4:1.6 php-src/ext/pdo_pgsql/config.m4:1.7 --- php-src/ext/pdo_pgsql/config.m4:1.6 Wed Feb 16 23:23:14 2005 +++ php-src/ext/pdo_pgsql/config.m4 Mon Feb 28 03:18:47 2005 @@ -1,7 +1,9 @@ dnl -dnl $Id: config.m4,v 1.6 2005/02/17 04:23:14 wez Exp $ +dnl $Id: config.m4,v 1.7 2005/02/28 08:18:47 rasmus Exp $ dnl +if test $PHP_PDO != no; then + AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[ ]) @@ -112,3 +114,5 @@ PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_inc_path $PDO_PGSQL_CFLAGS) PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo) fi + +fi http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.11r2=1.12ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.11 php-src/ext/pdo_sqlite/config.m4:1.12 --- php-src/ext/pdo_sqlite/config.m4:1.11 Sun Feb 27 22:21:52 2005 +++ php-src/ext/pdo_sqlite/config.m4Mon Feb 28 03:18:47 2005 @@ -1,7 +1,9 @@ -dnl $Id: config.m4,v 1.11 2005/02/28 03:21:52 wez Exp $ +dnl $Id: config.m4,v 1.12 2005/02/28 08:18:47 rasmus Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: +if test $PHP_PDO != no; then + PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO, [ --with-pdo-sqlite Include PDO sqlite 3 support],yes) @@ -116,3 +118,5 @@ fi PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo) fi + +fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe,
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c
jorton Mon Feb 28 08:30:53 2005 EDT Modified files: /php-src/ext/pdopdo_dbh.c Log: Fix type mismatch. http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.64r2=1.65ty=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.64 php-src/ext/pdo/pdo_dbh.c:1.65 --- php-src/ext/pdo/pdo_dbh.c:1.64 Sat Feb 26 12:27:51 2005 +++ php-src/ext/pdo/pdo_dbh.c Mon Feb 28 08:30:50 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_dbh.c,v 1.64 2005/02/26 17:27:51 wez Exp $ */ +/* $Id: pdo_dbh.c,v 1.65 2005/02/28 13:30:50 jorton Exp $ */ /* The PDO Database Handle Class */ @@ -889,7 +889,7 @@ int str_len; long paramtype = PDO_PARAM_STR; char *qstr; - size_t qlen; + int qlen; if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, s|l, str, str_len, paramtype)) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard var_unserializer.re
sesser Mon Feb 28 11:22:39 2005 EDT Modified files: /php-src/ext/standard var_unserializer.re Log: Drop invalid arrays http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.45r2=1.46ty=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.45 php-src/ext/standard/var_unserializer.re:1.46 --- php-src/ext/standard/var_unserializer.re:1.45 Sun Feb 27 06:30:41 2005 +++ php-src/ext/standard/var_unserializer.reMon Feb 28 11:22:39 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: var_unserializer.re,v 1.45 2005/02/27 11:30:41 stas Exp $ */ +/* $Id: var_unserializer.re,v 1.46 2005/02/28 16:22:39 sesser Exp $ */ #include php.h #include ext/standard/php_var.h @@ -477,6 +477,10 @@ a: uiv : { { int elements = parse_iv(start + 2); + if (elements 0) { + return 0; + } + *p = YYCURSOR; INIT_PZVAL(*rval); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard var_unserializer.re
sesser Mon Feb 28 11:32:50 2005 EDT Modified files: /php-src/ext/standard var_unserializer.re Log: This way around for correct error messages http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.46r2=1.47ty=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.46 php-src/ext/standard/var_unserializer.re:1.47 --- php-src/ext/standard/var_unserializer.re:1.46 Mon Feb 28 11:22:39 2005 +++ php-src/ext/standard/var_unserializer.reMon Feb 28 11:32:49 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: var_unserializer.re,v 1.46 2005/02/28 16:22:39 sesser Exp $ */ +/* $Id: var_unserializer.re,v 1.47 2005/02/28 16:32:49 sesser Exp $ */ #include php.h #include ext/standard/php_var.h @@ -477,12 +477,12 @@ a: uiv : { { int elements = parse_iv(start + 2); + *p = YYCURSOR; + if (elements 0) { return 0; } - *p = YYCURSOR; - INIT_PZVAL(*rval); Z_TYPE_PP(rval) = IS_ARRAY; ALLOC_HASHTABLE(Z_ARRVAL_PP(rval)); -- 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) /ext/standard var_unserializer.re
sesser Mon Feb 28 11:33:09 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/standard var_unserializer.re Log: MFH http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.27.2.10r2=1.27.2.11ty=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.27.2.10 php-src/ext/standard/var_unserializer.re:1.27.2.11 --- php-src/ext/standard/var_unserializer.re:1.27.2.10 Mon Feb 14 16:00:36 2005 +++ php-src/ext/standard/var_unserializer.reMon Feb 28 11:33:09 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: var_unserializer.re,v 1.27.2.10 2005/02/14 21:00:36 helly Exp $ */ +/* $Id: var_unserializer.re,v 1.27.2.11 2005/02/28 16:33:09 sesser Exp $ */ #include php.h #include ext/standard/php_var.h @@ -451,6 +451,10 @@ *p = YYCURSOR; + if (elements 0) { + return 0; + } + INIT_PZVAL(*rval); Z_TYPE_PP(rval) = IS_ARRAY; ALLOC_HASHTABLE(Z_ARRVAL_PP(rval)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard var_unserializer.re
sesser Mon Feb 28 11:33:23 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard var_unserializer.re Log: MFH http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.11.4.14r2=1.11.4.15ty=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.11.4.14 php-src/ext/standard/var_unserializer.re:1.11.4.15 --- php-src/ext/standard/var_unserializer.re:1.11.4.14 Tue Feb 15 03:08:55 2005 +++ php-src/ext/standard/var_unserializer.reMon Feb 28 11:33:23 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: var_unserializer.re,v 1.11.4.14 2005/02/15 08:08:55 helly Exp $ */ +/* $Id: var_unserializer.re,v 1.11.4.15 2005/02/28 16:33:23 sesser Exp $ */ #include php.h #include ext/standard/php_var.h @@ -463,6 +463,10 @@ *p = YYCURSOR; + if (elements 0) { + return 0; + } + INIT_PZVAL(*rval); Z_TYPE_PP(rval) = IS_ARRAY; ALLOC_HASHTABLE(Z_ARRVAL_PP(rval)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
sniper Mon Feb 28 11:45:14 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: typo http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.263r2=1.1760.2.264ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.263 php-src/NEWS:1.1760.2.264 --- php-src/NEWS:1.1760.2.263 Fri Feb 25 06:31:59 2005 +++ php-src/NEWSMon Feb 28 11:45:11 2005 @@ -131,7 +131,7 @@ (eggert at gnu dot org, Jani) - Fixed bug #28804 (ini-file section parsing pattern is buggy). (wendland at scan-plus dot de) -- Fixed bug #28451 (corupt EXIF headers have unlimited recursive IFD directory +- Fixed bug #28451 (corrupt EXIF headers have unlimited recursive IFD directory entries). (Andrei) - Fixed bug #28444 (Cannot access undefined property for object with overloaded property access). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Mon Feb 28 11:47:54 2005 EDT Modified files: /php-srcNEWS Log: reorder http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1843r2=1.1844ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1843 php-src/NEWS:1.1844 --- php-src/NEWS:1.1843 Mon Feb 21 10:17:00 2005 +++ php-src/NEWSMon Feb 28 11:47:52 2005 @@ -1,9 +1,6 @@ PHPNEWS ||| ?? ??? 2004, PHP 5.1.0 -- Added pg_field_type_oid() PostgreSQL function. (mauroi at digbang dot com) -- Added zend_declare_property_...() and zend_update_property_...() - API functions for bool, double and binary safe strings. (Hartmut) - Moved extensions to PECL: . ext/dio(Jani, Derick) . ext/yp (Jani, Derick) @@ -22,6 +19,9 @@ . virtual path handling by adding a realpath() cache. (Andi) . variable fetches. (Andi) . magic method invocations. (Marcus) +- Added pg_field_type_oid() PostgreSQL function. (mauroi at digbang dot com) +- Added zend_declare_property_...() and zend_update_property_...() + API functions for bool, double and binary safe strings. (Hartmut) - Added new classes in mysqli: mysqli_driver, mysqli_warning, mysqli_exception, and mysqli_sql_exception. (Georg) - Added possibility to access INI variables from within .ini file. (Andrei) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard var_unserializer.re
Hello Stefan, you need to commit the generated .c files afterwards (and you need re2c 0.9.4 which currently is only available from sf.net's cvs). regards marcus Monday, February 28, 2005, 5:22:39 PM, you wrote: sesser Mon Feb 28 11:22:39 2005 EDT Modified files: /php-src/ext/standard var_unserializer.re Log: Drop invalid arrays http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.45r2=1.46ty=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.45 php-src/ext/standard/var_unserializer.re:1.46 --- php-src/ext/standard/var_unserializer.re:1.45 Sun Feb 27 06:30:41 2005 +++ php-src/ext/standard/var_unserializer.reMon Feb 28 11:22:39 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: var_unserializer.re,v 1.45 2005/02/27 11:30:41 stas Exp $ */ +/* $Id: var_unserializer.re,v 1.46 2005/02/28 16:22:39 sesser Exp $ */ #include php.h #include ext/standard/php_var.h @@ -477,6 +477,10 @@ a: uiv : { { int elements = parse_iv(start + 2); + if (elements 0) { + return 0; + } + *p = YYCURSOR; INIT_PZVAL(*rval); -- Best regards, Marcusmailto:[EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
iliaa Mon Feb 28 17:09:23 2005 EDT Modified files: /php-srcphp.ini-dist php.ini-recommended Log: Added notes about ignore_user_abort to php.ini* http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.223r2=1.224ty=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.223 php-src/php.ini-dist:1.224 --- php-src/php.ini-dist:1.223 Mon Feb 14 03:23:53 2005 +++ php-src/php.ini-distMon Feb 28 17:09:21 2005 @@ -222,6 +222,10 @@ ;highlight.default = #BB ;highlight.html= #00 +; If enabled, the request will be allowed to complete even if the user aborts +; the request. Consider enabling it if executing long request, which may end up +; being interrupted by the user or a browser timing out. +; ignore_user_abort = On ; ; Misc http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.168r2=1.169ty=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.168 php-src/php.ini-recommended:1.169 --- php-src/php.ini-recommended:1.168 Mon Feb 14 03:23:54 2005 +++ php-src/php.ini-recommended Mon Feb 28 17:09:22 2005 @@ -280,6 +280,10 @@ ;highlight.default = #BB ;highlight.html= #00 +; If enabled, the request will be allowed to complete even if the user aborts +; the request. Consider enabling it if executing long request, which may end up +; being interrupted by the user or a browser timing out. +; ignore_user_abort = On ; ; Misc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Mon Feb 28 18:56:32 2005 EDT Modified files: /CVSROOTavail Log: php-src karma for johannes on request from Marcus http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.948r2=1.949ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.948 CVSROOT/avail:1.949 --- CVSROOT/avail:1.948 Sun Feb 27 14:14:37 2005 +++ CVSROOT/avail Mon Feb 28 18:56:30 2005 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh +avail|msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh # The Livedocs developers -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
johannesMon Feb 28 19:23:33 2005 EDT Modified files: /php-srcphp.ini-dist php.ini-recommended Log: - Change comment: Syntax highlighter uses span instead of font http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.224r2=1.225ty=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.224 php-src/php.ini-dist:1.225 --- php-src/php.ini-dist:1.224 Mon Feb 28 17:09:21 2005 +++ php-src/php.ini-distMon Feb 28 19:23:31 2005 @@ -214,7 +214,7 @@ disable_classes = ; Colors for Syntax Highlighting mode. Anything that's acceptable in -; font color=?? would work. +; span style=color: ??? would work. ;highlight.string = #DD ;highlight.comment = #FF9900 ;highlight.keyword = #007700 http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.169r2=1.170ty=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.169 php-src/php.ini-recommended:1.170 --- php-src/php.ini-recommended:1.169 Mon Feb 28 17:09:22 2005 +++ php-src/php.ini-recommended Mon Feb 28 19:23:31 2005 @@ -272,7 +272,7 @@ disable_classes = ; Colors for Syntax Highlighting mode. Anything that's acceptable in -; font color=?? would work. +; span style=color: ??? would work. ;highlight.string = #DD ;highlight.comment = #FF9900 ;highlight.keyword = #007700 -- 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) / php.ini-dist php.ini-recommended
johannesMon Feb 28 19:25:10 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcphp.ini-dist php.ini-recommended Log: - MFH http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.215.2.7r2=1.215.2.8ty=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.215.2.7 php-src/php.ini-dist:1.215.2.8 --- php-src/php.ini-dist:1.215.2.7 Mon Feb 14 03:25:30 2005 +++ php-src/php.ini-distMon Feb 28 19:25:09 2005 @@ -214,7 +214,7 @@ disable_classes = ; Colors for Syntax Highlighting mode. Anything that's acceptable in -; font color=?? would work. +; span style=color: ??? would work. ;highlight.string = #DD ;highlight.comment = #FF9900 ;highlight.keyword = #007700 http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.159.2.7r2=1.159.2.8ty=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.159.2.7 php-src/php.ini-recommended:1.159.2.8 --- php-src/php.ini-recommended:1.159.2.7 Mon Feb 14 03:25:30 2005 +++ php-src/php.ini-recommended Mon Feb 28 19:25:09 2005 @@ -272,7 +272,7 @@ disable_classes = ; Colors for Syntax Highlighting mode. Anything that's acceptable in -; font color=?? would work. +; span style=color: ??? would work. ;highlight.string = #DD ;highlight.comment = #FF9900 ;highlight.keyword = #007700 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite/sqlite/src parse.c parse.h
sniper Mon Feb 28 20:45:35 2005 EDT Modified files: /php-src/ext/pdo_sqlite/sqlite/src parse.c parse.h Log: touch http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite/src/parse.c?r1=1.3r2=1.4ty=u Index: php-src/ext/pdo_sqlite/sqlite/src/parse.c diff -u php-src/ext/pdo_sqlite/sqlite/src/parse.c:1.3 php-src/ext/pdo_sqlite/sqlite/src/parse.c:1.4 --- php-src/ext/pdo_sqlite/sqlite/src/parse.c:1.3 Sun Feb 27 00:20:19 2005 +++ php-src/ext/pdo_sqlite/sqlite/src/parse.c Mon Feb 28 20:45:33 2005 @@ -1,4 +1,4 @@ -/* Driver template for the LEMON parser generator. +/* Driver template for the LEMON parser generator. ** The author disclaims copyright to this source code. */ /* First off, code is include which follows the include declaration http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite/src/parse.h?r1=1.2r2=1.3ty=u Index: php-src/ext/pdo_sqlite/sqlite/src/parse.h diff -u php-src/ext/pdo_sqlite/sqlite/src/parse.h:1.2 php-src/ext/pdo_sqlite/sqlite/src/parse.h:1.3 --- php-src/ext/pdo_sqlite/sqlite/src/parse.h:1.2 Sun Feb 27 00:20:19 2005 +++ php-src/ext/pdo_sqlite/sqlite/src/parse.h Mon Feb 28 20:45:34 2005 @@ -138,3 +138,4 @@ #define TK_ELSE 138 #define TK_INDEX 139 #define TK_TO 140 + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /tests/basic bug31672.phpt ZendEngine2 zend_language_scanner.l
sniper Mon Feb 28 21:21:59 2005 EDT Added files: (Branch: PHP_5_0) /php-src/tests/basicbug31672.phpt Modified files: /php-srcNEWS /ZendEngine2zend_language_scanner.l Log: MFH: - Fixed bug #31672 (/script not considered closing tag if MFH: preceded by one-line comment) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.264r2=1.1760.2.265ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.264 php-src/NEWS:1.1760.2.265 --- php-src/NEWS:1.1760.2.264 Mon Feb 28 11:45:11 2005 +++ php-src/NEWSMon Feb 28 21:21:57 2005 @@ -58,6 +58,8 @@ - Fixed bug #31683 (changes to $name in __get($name) override future parameters). (Dmitry) - Fixed bug #31699 (unserialize() float problem on non-English locales). (Ilia) +- Fixed bug #31672 (/script not used as closing tag after one-line comment). + (Jani) - Fixed bug #31651 (ReflectionClass::getDefaultProperties segfaults with arrays). (Marcus) - Fixed bug #31623 (OCILogin does not support password grace period). http://cvs.php.net/diff.php/ZendEngine2/zend_language_scanner.l?r1=1.111.2.6r2=1.111.2.7ty=u Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.111.2.6 ZendEngine2/zend_language_scanner.l:1.111.2.7 --- ZendEngine2/zend_language_scanner.l:1.111.2.6 Sat Feb 19 09:36:07 2005 +++ ZendEngine2/zend_language_scanner.l Mon Feb 28 21:21:58 2005 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: zend_language_scanner.l,v 1.111.2.6 2005/02/19 14:36:07 hirokawa Exp $ */ +/* $Id: zend_language_scanner.l,v 1.111.2.7 2005/03/01 02:21:58 sniper Exp $ */ #define yyleng SCNG(yy_leng) #define yytext SCNG(yy_text) @@ -1432,11 +1432,11 @@ yymore(); } -ST_ONE_LINE_COMMENT?|%| { +ST_ONE_LINE_COMMENT?|%|| { yymore(); } -ST_ONE_LINE_COMMENT[^\n\r?%]+ { +ST_ONE_LINE_COMMENT[^\n\r?%]+ { yymore(); } @@ -1449,6 +1449,15 @@ return T_COMMENT; } +ST_ONE_LINE_COMMENT/script { + zendlval-value.str.val = yytext; /* no copying - intentional */ + zendlval-value.str.len = yyleng; + zendlval-type = IS_STRING; + yyless(yyleng-9); + BEGIN(ST_IN_SCRIPTING); + return T_COMMENT; +} + ST_ONE_LINE_COMMENT?|% { if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */ zendlval-value.str.val = yytext; /* no copying - intentional */ @@ -1497,7 +1506,7 @@ yymore(); } -ST_IN_SCRIPTING(?|/script{WHITESPACE}*){NEWLINE}? { +ST_IN_SCRIPTING(?|/script){NEWLINE}? { zendlval-value.str.val = yytext; /* no copying - intentional */ zendlval-value.str.len = yyleng; zendlval-type = IS_STRING; http://cvs.php.net/co.php/php-src/tests/basic/bug31672.phpt?r=1.1p=1 Index: php-src/tests/basic/bug31672.phpt +++ php-src/tests/basic/bug31672.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php