[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Nov 27 01:31:29 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2880r2=1.2881diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2880 php-src/ChangeLog:1.2881 --- php-src/ChangeLog:1.2880Mon Nov 26 01:31:35 2007 +++ php-src/ChangeLog Tue Nov 27 01:31:28 2007 @@ -1,3 +1,42 @@ +2007-11-26 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/pdo/pdo_sql_parser.c + ext/pdo/pdo_sql_parser.c + ext/pdo/pdo_sql_parser.re + ext/pdo/pdo_sql_parser.re: + + MFB: Revert addition of - char support for bound param names + +* (PHP_5_3) + ext/pdo/pdo_sql_parser.c + ext/pdo/pdo_sql_parser.re: + Revert addition of - char support for bound param names + +2007-11-26 Jani Taskinen [EMAIL PROTECTED] + +* main/php_ini.c: + - No zval is stored here + +* (PHP_5_2) + ext/pcre/php_pcre.c + ext/pcre/php_pcre.c + ext/pdo/php_pdo_driver.h + ext/pdo/php_pdo_driver.h + ext/spl/spl_directory.h + ext/spl/spl_directory.h + ext/spl/spl_iterators.h + ext/spl/spl_iterators.h + main/streams/php_stream_filter_api.h + main/streams/php_stream_filter_api.h: + MFH:- Fixed bug #43365 (Several enums have trailing commas) + +* ext/pcre/php_pcre.c + ext/pdo/php_pdo_driver.h + ext/spl/spl_directory.h + ext/spl/spl_iterators.h + main/streams/php_stream_filter_api.h: + - Fixed bug #43365 (Several enums have trailing commas) + 2007-11-25 Ilia Alshanetsky [EMAIL PROTECTED] * ext/standard/array.c:
[PHP-CVS] cvs: php-src /ext/pcre php_pcre.c /ext/pdo php_pdo_driver.h /ext/spl spl_directory.h spl_iterators.h /main/streams php_stream_filter_api.h
janiMon Nov 26 10:58:28 2007 UTC Modified files: /php-src/ext/pcre php_pcre.c /php-src/ext/pdophp_pdo_driver.h /php-src/ext/splspl_directory.h spl_iterators.h /php-src/main/streams php_stream_filter_api.h Log: - Fixed bug #43365 (Several enums have trailing commas) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.225r2=1.226diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.225 php-src/ext/pcre/php_pcre.c:1.226 --- php-src/ext/pcre/php_pcre.c:1.225 Sun Oct 7 12:21:05 2007 +++ php-src/ext/pcre/php_pcre.c Mon Nov 26 10:58:28 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_pcre.c,v 1.225 2007/10/07 12:21:05 nlopess Exp $ */ +/* $Id: php_pcre.c,v 1.226 2007/11/26 10:58:28 jani Exp $ */ /* TODO * php_pcre_replace_impl(): @@ -53,7 +53,7 @@ PHP_PCRE_INTERNAL_ERROR, PHP_PCRE_BACKTRACK_LIMIT_ERROR, PHP_PCRE_RECURSION_LIMIT_ERROR, - PHP_PCRE_BAD_UTF8_ERROR, + PHP_PCRE_BAD_UTF8_ERROR }; typedef struct { http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/php_pdo_driver.h?r1=1.88r2=1.89diff_format=u Index: php-src/ext/pdo/php_pdo_driver.h diff -u php-src/ext/pdo/php_pdo_driver.h:1.88 php-src/ext/pdo/php_pdo_driver.h:1.89 --- php-src/ext/pdo/php_pdo_driver.h:1.88 Thu Sep 27 18:28:40 2007 +++ php-src/ext/pdo/php_pdo_driver.hMon Nov 26 10:58:28 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_pdo_driver.h,v 1.88 2007/09/27 18:28:40 dmitry Exp $ */ +/* $Id: php_pdo_driver.h,v 1.89 2007/11/26 10:58:28 jani Exp $ */ #ifndef PHP_PDO_DRIVER_H #define PHP_PDO_DRIVER_H @@ -68,7 +68,7 @@ PDO_PARAM_STMT, /* hierarchical result set */ /* get_col ptr should point to a zend_bool */ - PDO_PARAM_BOOL, + PDO_PARAM_BOOL }; /* magic flag to denote a parameter as being input/output */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.h?r1=1.35r2=1.36diff_format=u Index: php-src/ext/spl/spl_directory.h diff -u php-src/ext/spl/spl_directory.h:1.35 php-src/ext/spl/spl_directory.h:1.36 --- php-src/ext/spl/spl_directory.h:1.35Wed Oct 3 10:31:03 2007 +++ php-src/ext/spl/spl_directory.h Mon Nov 26 10:58:28 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_directory.h,v 1.35 2007/10/03 10:31:03 dsp Exp $ */ +/* $Id: spl_directory.h,v 1.36 2007/11/26 10:58:28 jani Exp $ */ #ifndef SPL_DIRECTORY_H #define SPL_DIRECTORY_H @@ -35,7 +35,7 @@ typedef enum { SPL_FS_INFO, /* must be 0 */ SPL_FS_DIR, - SPL_FS_FILE, + SPL_FS_FILE } SPL_FS_OBJ_TYPE; typedef struct _spl_filesystem_object spl_filesystem_object; http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.h?r1=1.42r2=1.43diff_format=u Index: php-src/ext/spl/spl_iterators.h diff -u php-src/ext/spl/spl_iterators.h:1.42 php-src/ext/spl/spl_iterators.h:1.43 --- php-src/ext/spl/spl_iterators.h:1.42Fri May 11 00:14:36 2007 +++ php-src/ext/spl/spl_iterators.h Mon Nov 26 10:58:28 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.h,v 1.42 2007/05/11 00:14:36 helly Exp $ */ +/* $Id: spl_iterators.h,v 1.43 2007/11/26 10:58:28 jani Exp $ */ #ifndef SPL_ITERATORS_H #define SPL_ITERATORS_H @@ -94,7 +94,7 @@ enum { /* public */ REGIT_USE_KEY= 0x0001, - REGIT_INVERTED = 0x0002, + REGIT_INVERTED = 0x0002 }; typedef enum { @@ -103,7 +103,7 @@ REGIT_MODE_ALL_MATCHES, REGIT_MODE_SPLIT, REGIT_MODE_REPLACE, - REGIT_MODE_MAX, + REGIT_MODE_MAX } regex_mode; typedef struct _spl_dual_it_object { http://cvs.php.net/viewvc.cgi/php-src/main/streams/php_stream_filter_api.h?r1=1.21r2=1.22diff_format=u Index: php-src/main/streams/php_stream_filter_api.h diff -u php-src/main/streams/php_stream_filter_api.h:1.21 php-src/main/streams/php_stream_filter_api.h:1.22 --- php-src/main/streams/php_stream_filter_api.h:1.21 Sun Oct 7 05:15:07 2007 +++ php-src/main/streams/php_stream_filter_api.hMon Nov 26 10:58:28 2007 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: php_stream_filter_api.h,v 1.21 2007/10/07 05:15:07 davidw Exp $ */ +/* $Id: php_stream_filter_api.h,v 1.22 2007/11/26 10:58:28 jani Exp $ */ /* The filter API works on the principle of Bucket-Brigades. This is * partially inspired by the Apache 2 method of doing things, although @@ -64,7 +64,7 @@ typedef enum { PSFS_ERR_FATAL, /* error in data stream */ PSFS_FEED_ME, /* filter needs more data; stop processing chain until more is available */ - PSFS_PASS_ON, /* filter generated
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcre php_pcre.c /ext/pdo php_pdo_driver.h /ext/spl spl_directory.h spl_iterators.h /main/streams php_stream_filter_api.h
janiMon Nov 26 10:59:05 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pcre php_pcre.c /php-src/ext/pdophp_pdo_driver.h /php-src/ext/splspl_directory.h spl_iterators.h /php-src/main/streams php_stream_filter_api.h Log: MFH:- Fixed bug #43365 (Several enums have trailing commas) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.6r2=1.168.2.9.2.21.2.7diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.6 php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.7 --- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.6 Sun Oct 7 13:57:10 2007 +++ php-src/ext/pcre/php_pcre.c Mon Nov 26 10:59:04 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.6 2007/10/07 13:57:10 nlopess Exp $ */ +/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.7 2007/11/26 10:59:04 jani Exp $ */ #include php.h #include php_ini.h @@ -48,7 +48,7 @@ PHP_PCRE_INTERNAL_ERROR, PHP_PCRE_BACKTRACK_LIMIT_ERROR, PHP_PCRE_RECURSION_LIMIT_ERROR, - PHP_PCRE_BAD_UTF8_ERROR, + PHP_PCRE_BAD_UTF8_ERROR }; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/php_pdo_driver.h?r1=1.66.2.11.2.6.2.1r2=1.66.2.11.2.6.2.2diff_format=u Index: php-src/ext/pdo/php_pdo_driver.h diff -u php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6.2.1 php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6.2.2 --- php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6.2.1 Thu Sep 27 18:00:42 2007 +++ php-src/ext/pdo/php_pdo_driver.hMon Nov 26 10:59:04 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_pdo_driver.h,v 1.66.2.11.2.6.2.1 2007/09/27 18:00:42 dmitry Exp $ */ +/* $Id: php_pdo_driver.h,v 1.66.2.11.2.6.2.2 2007/11/26 10:59:04 jani Exp $ */ #ifndef PHP_PDO_DRIVER_H #define PHP_PDO_DRIVER_H @@ -67,7 +67,7 @@ PDO_PARAM_STMT, /* hierarchical result set */ /* get_col ptr should point to a zend_bool */ - PDO_PARAM_BOOL, + PDO_PARAM_BOOL }; /* magic flag to denote a parameter as being input/output */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.h?r1=1.12.2.5.2.4.2.1r2=1.12.2.5.2.4.2.2diff_format=u Index: php-src/ext/spl/spl_directory.h diff -u php-src/ext/spl/spl_directory.h:1.12.2.5.2.4.2.1 php-src/ext/spl/spl_directory.h:1.12.2.5.2.4.2.2 --- php-src/ext/spl/spl_directory.h:1.12.2.5.2.4.2.1Wed Oct 3 10:44:32 2007 +++ php-src/ext/spl/spl_directory.h Mon Nov 26 10:59:04 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_directory.h,v 1.12.2.5.2.4.2.1 2007/10/03 10:44:32 dsp Exp $ */ +/* $Id: spl_directory.h,v 1.12.2.5.2.4.2.2 2007/11/26 10:59:04 jani Exp $ */ #ifndef SPL_DIRECTORY_H #define SPL_DIRECTORY_H @@ -35,7 +35,7 @@ typedef enum { SPL_FS_INFO, /* must be 0 */ SPL_FS_DIR, - SPL_FS_FILE, + SPL_FS_FILE } SPL_FS_OBJ_TYPE; typedef struct _spl_filesystem_object spl_filesystem_object; http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.h?r1=1.18.2.7.2.12r2=1.18.2.7.2.12.2.1diff_format=u Index: php-src/ext/spl/spl_iterators.h diff -u php-src/ext/spl/spl_iterators.h:1.18.2.7.2.12 php-src/ext/spl/spl_iterators.h:1.18.2.7.2.12.2.1 --- php-src/ext/spl/spl_iterators.h:1.18.2.7.2.12 Fri May 11 00:15:25 2007 +++ php-src/ext/spl/spl_iterators.h Mon Nov 26 10:59:04 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.h,v 1.18.2.7.2.12 2007/05/11 00:15:25 helly Exp $ */ +/* $Id: spl_iterators.h,v 1.18.2.7.2.12.2.1 2007/11/26 10:59:04 jani Exp $ */ #ifndef SPL_ITERATORS_H #define SPL_ITERATORS_H @@ -94,7 +94,7 @@ enum { /* public */ REGIT_USE_KEY= 0x0001, - REGIT_INVERTED = 0x0002, + REGIT_INVERTED = 0x0002 }; typedef enum { @@ -103,7 +103,7 @@ REGIT_MODE_ALL_MATCHES, REGIT_MODE_SPLIT, REGIT_MODE_REPLACE, - REGIT_MODE_MAX, + REGIT_MODE_MAX } regex_mode; typedef struct _spl_dual_it_object { http://cvs.php.net/viewvc.cgi/php-src/main/streams/php_stream_filter_api.h?r1=1.13.2.1.2.1r2=1.13.2.1.2.1.2.1diff_format=u Index: php-src/main/streams/php_stream_filter_api.h diff -u php-src/main/streams/php_stream_filter_api.h:1.13.2.1.2.1 php-src/main/streams/php_stream_filter_api.h:1.13.2.1.2.1.2.1 --- php-src/main/streams/php_stream_filter_api.h:1.13.2.1.2.1 Mon Jan 1 09:36:12 2007 +++ php-src/main/streams/php_stream_filter_api.hMon Nov 26 10:59:04 2007 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: php_stream_filter_api.h,v 1.13.2.1.2.1 2007/01/01 09:36:12 sebastian Exp $ */ +/* $Id: php_stream_filter_api.h,v 1.13.2.1.2.1.2.1
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre php_pcre.c /ext/pdo php_pdo_driver.h /ext/spl spl_directory.h spl_iterators.h /main/streams php_stream_filter_api.h
janiMon Nov 26 10:59:18 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pcre php_pcre.c /php-src/ext/pdophp_pdo_driver.h /php-src/ext/splspl_directory.h spl_iterators.h /php-src/main/streams php_stream_filter_api.h Log: MFH:- Fixed bug #43365 (Several enums have trailing commas) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21r2=1.168.2.9.2.22diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21 php-src/ext/pcre/php_pcre.c:1.168.2.9.2.22 --- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21 Thu Sep 20 08:10:44 2007 +++ php-src/ext/pcre/php_pcre.c Mon Nov 26 10:59:17 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_pcre.c,v 1.168.2.9.2.21 2007/09/20 08:10:44 tony2001 Exp $ */ +/* $Id: php_pcre.c,v 1.168.2.9.2.22 2007/11/26 10:59:17 jani Exp $ */ #include php.h #include php_ini.h @@ -48,7 +48,7 @@ PHP_PCRE_INTERNAL_ERROR, PHP_PCRE_BACKTRACK_LIMIT_ERROR, PHP_PCRE_RECURSION_LIMIT_ERROR, - PHP_PCRE_BAD_UTF8_ERROR, + PHP_PCRE_BAD_UTF8_ERROR }; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/php_pdo_driver.h?r1=1.66.2.11.2.6r2=1.66.2.11.2.7diff_format=u Index: php-src/ext/pdo/php_pdo_driver.h diff -u php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6 php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.7 --- php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6 Mon Jul 23 11:53:58 2007 +++ php-src/ext/pdo/php_pdo_driver.hMon Nov 26 10:59:17 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_pdo_driver.h,v 1.66.2.11.2.6 2007/07/23 11:53:58 jani Exp $ */ +/* $Id: php_pdo_driver.h,v 1.66.2.11.2.7 2007/11/26 10:59:17 jani Exp $ */ #ifndef PHP_PDO_DRIVER_H #define PHP_PDO_DRIVER_H @@ -67,7 +67,7 @@ PDO_PARAM_STMT, /* hierarchical result set */ /* get_col ptr should point to a zend_bool */ - PDO_PARAM_BOOL, + PDO_PARAM_BOOL }; /* magic flag to denote a parameter as being input/output */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.h?r1=1.12.2.5.2.4r2=1.12.2.5.2.5diff_format=u Index: php-src/ext/spl/spl_directory.h diff -u php-src/ext/spl/spl_directory.h:1.12.2.5.2.4 php-src/ext/spl/spl_directory.h:1.12.2.5.2.5 --- php-src/ext/spl/spl_directory.h:1.12.2.5.2.4Mon Jan 1 09:36:07 2007 +++ php-src/ext/spl/spl_directory.h Mon Nov 26 10:59:18 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_directory.h,v 1.12.2.5.2.4 2007/01/01 09:36:07 sebastian Exp $ */ +/* $Id: spl_directory.h,v 1.12.2.5.2.5 2007/11/26 10:59:18 jani Exp $ */ #ifndef SPL_DIRECTORY_H #define SPL_DIRECTORY_H @@ -35,7 +35,7 @@ typedef enum { SPL_FS_INFO, /* must be 0 */ SPL_FS_DIR, - SPL_FS_FILE, + SPL_FS_FILE } SPL_FS_OBJ_TYPE; typedef struct _spl_filesystem_object spl_filesystem_object; http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.h?r1=1.18.2.7.2.12r2=1.18.2.7.2.13diff_format=u Index: php-src/ext/spl/spl_iterators.h diff -u php-src/ext/spl/spl_iterators.h:1.18.2.7.2.12 php-src/ext/spl/spl_iterators.h:1.18.2.7.2.13 --- php-src/ext/spl/spl_iterators.h:1.18.2.7.2.12 Fri May 11 00:15:25 2007 +++ php-src/ext/spl/spl_iterators.h Mon Nov 26 10:59:18 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.h,v 1.18.2.7.2.12 2007/05/11 00:15:25 helly Exp $ */ +/* $Id: spl_iterators.h,v 1.18.2.7.2.13 2007/11/26 10:59:18 jani Exp $ */ #ifndef SPL_ITERATORS_H #define SPL_ITERATORS_H @@ -94,7 +94,7 @@ enum { /* public */ REGIT_USE_KEY= 0x0001, - REGIT_INVERTED = 0x0002, + REGIT_INVERTED = 0x0002 }; typedef enum { @@ -103,7 +103,7 @@ REGIT_MODE_ALL_MATCHES, REGIT_MODE_SPLIT, REGIT_MODE_REPLACE, - REGIT_MODE_MAX, + REGIT_MODE_MAX } regex_mode; typedef struct _spl_dual_it_object { http://cvs.php.net/viewvc.cgi/php-src/main/streams/php_stream_filter_api.h?r1=1.13.2.1.2.1r2=1.13.2.1.2.2diff_format=u Index: php-src/main/streams/php_stream_filter_api.h diff -u php-src/main/streams/php_stream_filter_api.h:1.13.2.1.2.1 php-src/main/streams/php_stream_filter_api.h:1.13.2.1.2.2 --- php-src/main/streams/php_stream_filter_api.h:1.13.2.1.2.1 Mon Jan 1 09:36:12 2007 +++ php-src/main/streams/php_stream_filter_api.hMon Nov 26 10:59:18 2007 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: php_stream_filter_api.h,v 1.13.2.1.2.1 2007/01/01 09:36:12 sebastian Exp $ */ +/* $Id: php_stream_filter_api.h,v 1.13.2.1.2.2 2007/11/26 10:59:18 jani Exp $ */ /* The filter API works on the principle of Bucket-Brigades.
[PHP-CVS] cvs: CVSROOT / avail
pajoye Mon Nov 26 15:14:41 2007 UTC Modified files: /CVSROOTavail Log: - Francois karma for pecl/phk - Kevin Shepherd for gd http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1330r2=1.1331diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1330 CVSROOT/avail:1.1331 --- CVSROOT/avail:1.1330Wed Nov 21 10:37:12 2007 +++ CVSROOT/avail Mon Nov 26 15:14:40 2007 @@ -288,6 +288,7 @@ avail|lwe|pecl/pdo_firebird,php-src/ext/pdo_firebird avail|mkoppanen|pecl/ssh2 avail|bdeshong|pecl/usblib +avail|francois|pecl/phk # Objective-C bridge avail|wez,jan|php-objc @@ -319,7 +320,7 @@ # Please ask [EMAIL PROTECTED] before adding some unknown guys :) # gd/libgd is the library itself, other directories are for # the various tools (website, bugs,...) -avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias|gd +avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias,kshepherd|gd avail|mattias|php-src/ext/gd # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_ini.c
janiMon Nov 26 16:34:07 2007 UTC Modified files: /php-src/main php_ini.c Log: - No zval is stored here http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.162r2=1.163diff_format=u Index: php-src/main/php_ini.c diff -u php-src/main/php_ini.c:1.162 php-src/main/php_ini.c:1.163 --- php-src/main/php_ini.c:1.162Fri Nov 9 16:26:55 2007 +++ php-src/main/php_ini.c Mon Nov 26 16:34:07 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_ini.c,v 1.162 2007/11/09 16:26:55 jani Exp $ */ +/* $Id: php_ini.c,v 1.163 2007/11/26 16:34:07 jani Exp $ */ #include php.h #include ext/standard/info.h @@ -347,7 +347,7 @@ } zend_llist_init(extension_lists.engine, sizeof(char *), (llist_dtor_func_t) free_estring, 1); - zend_llist_init(extension_lists.functions, sizeof(zval), (llist_dtor_func_t) free_estring, 1); + zend_llist_init(extension_lists.functions, sizeof(char *), (llist_dtor_func_t) free_estring, 1); open_basedir = PG(open_basedir); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /main php_ini.c
janiMon Nov 26 16:34:30 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/main php_ini.c Log: MFH: No zval is stored here http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.15.2.4r2=1.136.2.4.2.15.2.5diff_format=u Index: php-src/main/php_ini.c diff -u php-src/main/php_ini.c:1.136.2.4.2.15.2.4 php-src/main/php_ini.c:1.136.2.4.2.15.2.5 --- php-src/main/php_ini.c:1.136.2.4.2.15.2.4 Fri Nov 9 16:27:43 2007 +++ php-src/main/php_ini.c Mon Nov 26 16:34:30 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_ini.c,v 1.136.2.4.2.15.2.4 2007/11/09 16:27:43 jani Exp $ */ +/* $Id: php_ini.c,v 1.136.2.4.2.15.2.5 2007/11/26 16:34:30 jani Exp $ */ #include php.h #include ext/standard/info.h @@ -348,7 +348,7 @@ } zend_llist_init(extension_lists.engine, sizeof(char *), (llist_dtor_func_t) free_estring, 1); - zend_llist_init(extension_lists.functions, sizeof(zval), (llist_dtor_func_t) free_estring, 1); + zend_llist_init(extension_lists.functions, sizeof(char *), (llist_dtor_func_t) free_estring, 1); safe_mode_state = PG(safe_mode); open_basedir = PG(open_basedir); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_sql_parser.c pdo_sql_parser.re
iliaa Mon Nov 26 21:09:50 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdopdo_sql_parser.c pdo_sql_parser.re Log: Revert addition of - char support for bound param names http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.35.2.6.2.12.2.1r2=1.35.2.6.2.12.2.2diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.c diff -u php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.12.2.1 php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.12.2.2 --- php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.12.2.1 Mon Oct 29 22:36:26 2007 +++ php-src/ext/pdo/pdo_sql_parser.cMon Nov 26 21:09:50 2007 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.11.0 on Mon Oct 29 18:26:12 2007 */ +/* Generated by re2c 0.11.0 on Mon Nov 26 15:18:37 2007 */ #line 1 ext/pdo/pdo_sql_parser.re /* +--+ @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.12.2.1 2007/10/29 22:36:26 iliaa Exp $ */ +/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.12.2.2 2007/11/26 21:09:50 iliaa Exp $ */ #include php.h #include php_pdo_driver.h @@ -78,7 +78,6 @@ yy5: yych = *++YYCURSOR; switch(yych) { - case '-': case '0': case '1': case '2': @@ -156,7 +155,7 @@ yy7: #line 62 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_BIND_POS); } -#line 160 ext/pdo/pdo_sql_parser.c +#line 159 ext/pdo/pdo_sql_parser.c yy8: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -172,12 +171,12 @@ yy10: #line 64 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 176 ext/pdo/pdo_sql_parser.c +#line 175 ext/pdo/pdo_sql_parser.c yy11: ++YYCURSOR; #line 65 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_EOI); } -#line 181 ext/pdo/pdo_sql_parser.c +#line 180 ext/pdo/pdo_sql_parser.c yy13: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -190,13 +189,12 @@ yy15: #line 60 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 194 ext/pdo/pdo_sql_parser.c +#line 193 ext/pdo/pdo_sql_parser.c yy16: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych) { - case '-': case '0': case '1': case '2': @@ -265,7 +263,7 @@ yy18: #line 61 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_BIND); } -#line 269 ext/pdo/pdo_sql_parser.c +#line 267 ext/pdo/pdo_sql_parser.c yy19: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -279,7 +277,7 @@ ++YYCURSOR; #line 59 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 283 ext/pdo/pdo_sql_parser.c +#line 281 ext/pdo/pdo_sql_parser.c yy23: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -293,7 +291,7 @@ ++YYCURSOR; #line 58 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 297 ext/pdo/pdo_sql_parser.c +#line 295 ext/pdo/pdo_sql_parser.c } #line 66 ext/pdo/pdo_sql_parser.re http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.9.2.1r2=1.28.2.4.2.9.2.2diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.re diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.1 php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.2 --- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.1 Mon Oct 29 22:36:26 2007 +++ php-src/ext/pdo/pdo_sql_parser.re Mon Nov 26 21:09:50 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.9.2.1 2007/10/29 22:36:26 iliaa Exp $ */ +/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.9.2.2 2007/11/26 21:09:50 iliaa Exp $ */ #include php.h #include php_pdo_driver.h @@ -46,7 +46,7 @@ s-tok = cursor; /*!re2c - BINDCHR = [:][a-zA-Z0-9_-]+; + BINDCHR = [:][a-zA-Z0-9_]+; QUESTION= [?]; SPECIALS= [:?']; MULTICHAR = [:?]; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_sql_parser.c pdo_sql_parser.re
iliaa Mon Nov 26 21:10:19 2007 UTC Modified files: /php-src/ext/pdopdo_sql_parser.c pdo_sql_parser.re Log: MFB: Revert addition of - char support for bound param names http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.55r2=1.56diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.c diff -u php-src/ext/pdo/pdo_sql_parser.c:1.55 php-src/ext/pdo/pdo_sql_parser.c:1.56 --- php-src/ext/pdo/pdo_sql_parser.c:1.55 Mon Oct 29 22:37:44 2007 +++ php-src/ext/pdo/pdo_sql_parser.cMon Nov 26 21:10:18 2007 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.11.0 on Mon Oct 29 18:37:31 2007 */ +/* Generated by re2c 0.11.0 on Mon Nov 26 16:10:00 2007 */ #line 1 ext/pdo/pdo_sql_parser.re /* +--+ @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_sql_parser.c,v 1.55 2007/10/29 22:37:44 iliaa Exp $ */ +/* $Id: pdo_sql_parser.c,v 1.56 2007/11/26 21:10:18 iliaa Exp $ */ #include php.h #include php_pdo_driver.h @@ -94,7 +94,6 @@ case '\'': case ':': case '?': goto yy13; - case '-': case '0': case '1': case '2': @@ -172,7 +171,7 @@ yy7: #line 61 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_BIND_POS); } -#line 176 ext/pdo/pdo_sql_parser.c +#line 175 ext/pdo/pdo_sql_parser.c yy8: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -188,12 +187,12 @@ yy10: #line 63 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 192 ext/pdo/pdo_sql_parser.c +#line 191 ext/pdo/pdo_sql_parser.c yy11: ++YYCURSOR; #line 64 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_EOI); } -#line 197 ext/pdo/pdo_sql_parser.c +#line 196 ext/pdo/pdo_sql_parser.c yy13: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -208,13 +207,12 @@ yy15: #line 59 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 212 ext/pdo/pdo_sql_parser.c +#line 211 ext/pdo/pdo_sql_parser.c yy16: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych) { - case '-': case '0': case '1': case '2': @@ -283,7 +281,7 @@ yy18: #line 60 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_BIND); } -#line 287 ext/pdo/pdo_sql_parser.c +#line 285 ext/pdo/pdo_sql_parser.c yy19: if((YYLIMIT - YYCURSOR) 2) YYFILL(2); yych = *YYCURSOR; @@ -306,7 +304,7 @@ yy22: #line 58 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 310 ext/pdo/pdo_sql_parser.c +#line 308 ext/pdo/pdo_sql_parser.c yy23: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -330,7 +328,7 @@ yy27: #line 57 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 334 ext/pdo/pdo_sql_parser.c +#line 332 ext/pdo/pdo_sql_parser.c yy28: if((YYLIMIT - YYCURSOR) 2) YYFILL(2); yych = *YYCURSOR; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.41r2=1.42diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.re diff -u php-src/ext/pdo/pdo_sql_parser.re:1.41 php-src/ext/pdo/pdo_sql_parser.re:1.42 --- php-src/ext/pdo/pdo_sql_parser.re:1.41 Mon Oct 29 22:37:44 2007 +++ php-src/ext/pdo/pdo_sql_parser.re Mon Nov 26 21:10:18 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pdo_sql_parser.re,v 1.41 2007/10/29 22:37:44 iliaa Exp $ */ +/* $Id: pdo_sql_parser.re,v 1.42 2007/11/26 21:10:18 iliaa Exp $ */ #include php.h #include php_pdo_driver.h @@ -46,7 +46,7 @@ s-tok = cursor; /*!re2c - BINDCHR = [:][a-zA-Z0-9_-]+; + BINDCHR = [:][a-zA-Z0-9_]+; QUESTION= [?]; SPECIALS= [:?']; EOF = [\000]; -- 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/pdo pdo_sql_parser.c pdo_sql_parser.re
iliaa Mon Nov 26 21:10:41 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdopdo_sql_parser.c pdo_sql_parser.re Log: MFB: Revert addition of - char support for bound param names http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.35.2.6.2.13r2=1.35.2.6.2.14diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.c diff -u php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.13 php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.14 --- php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.13 Mon Oct 29 22:37:25 2007 +++ php-src/ext/pdo/pdo_sql_parser.cMon Nov 26 21:10:41 2007 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.11.0 on Mon Oct 29 18:36:37 2007 */ +/* Generated by re2c 0.11.0 on Mon Nov 26 16:10:28 2007 */ #line 1 ext/pdo/pdo_sql_parser.re /* +--+ @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.13 2007/10/29 22:37:25 iliaa Exp $ */ +/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.14 2007/11/26 21:10:41 iliaa Exp $ */ #include php.h #include php_pdo_driver.h @@ -78,7 +78,6 @@ yy5: yych = *++YYCURSOR; switch(yych) { - case '-': case '0': case '1': case '2': @@ -156,7 +155,7 @@ yy7: #line 62 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_BIND_POS); } -#line 160 ext/pdo/pdo_sql_parser.c +#line 159 ext/pdo/pdo_sql_parser.c yy8: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -172,12 +171,12 @@ yy10: #line 64 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 176 ext/pdo/pdo_sql_parser.c +#line 175 ext/pdo/pdo_sql_parser.c yy11: ++YYCURSOR; #line 65 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_EOI); } -#line 181 ext/pdo/pdo_sql_parser.c +#line 180 ext/pdo/pdo_sql_parser.c yy13: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -190,13 +189,12 @@ yy15: #line 60 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 194 ext/pdo/pdo_sql_parser.c +#line 193 ext/pdo/pdo_sql_parser.c yy16: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych) { - case '-': case '0': case '1': case '2': @@ -265,7 +263,7 @@ yy18: #line 61 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_BIND); } -#line 269 ext/pdo/pdo_sql_parser.c +#line 267 ext/pdo/pdo_sql_parser.c yy19: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -279,7 +277,7 @@ ++YYCURSOR; #line 59 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 283 ext/pdo/pdo_sql_parser.c +#line 281 ext/pdo/pdo_sql_parser.c yy23: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -293,7 +291,7 @@ ++YYCURSOR; #line 58 ext/pdo/pdo_sql_parser.re { RET(PDO_PARSER_TEXT); } -#line 297 ext/pdo/pdo_sql_parser.c +#line 295 ext/pdo/pdo_sql_parser.c } #line 66 ext/pdo/pdo_sql_parser.re http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.10r2=1.28.2.4.2.11diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.re diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.10 php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.11 --- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.10 Mon Oct 29 22:37:25 2007 +++ php-src/ext/pdo/pdo_sql_parser.re Mon Nov 26 21:10:41 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.10 2007/10/29 22:37:25 iliaa Exp $ */ +/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.11 2007/11/26 21:10:41 iliaa Exp $ */ #include php.h #include php_pdo_driver.h @@ -46,7 +46,7 @@ s-tok = cursor; /*!re2c - BINDCHR = [:][a-zA-Z0-9_-]+; + BINDCHR = [:][a-zA-Z0-9_]+; QUESTION= [?]; SPECIALS= [:?']; MULTICHAR = [:?]; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo/tests bug_43130.phpt
tony2001Tue Nov 27 06:44:17 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdo/tests bug_43130.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug_43130.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/pdo/tests/bug_43130.phpt diff -u php-src/ext/pdo/tests/bug_43130.phpt:1.1.2.2 php-src/ext/pdo/tests/bug_43130.phpt:1.1.2.3 --- php-src/ext/pdo/tests/bug_43130.phpt:1.1.2.2Tue Oct 30 23:03:23 2007 +++ php-src/ext/pdo/tests/bug_43130.phptTue Nov 27 06:44:16 2007 @@ -27,5 +27,7 @@ $stmt-execute(); var_dump($stmt-fetch(PDO::FETCH_COLUMN)); ? ---EXPECT-- -string(5) test1 +--EXPECTF-- +Warning: PDOStatement::execute(): SQLSTATE[HY093]: Invalid parameter number: parameter was not defined in %s on line %d + +Warning: PDOStatement::execute(): SQLSTATE[HY093]: Invalid parameter number in %s on line %d -- 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/pdo/tests bug_43130.phpt
tony2001Tue Nov 27 06:44:32 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo/tests bug_43130.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug_43130.phpt?r1=1.1.4.3r2=1.1.4.4diff_format=u Index: php-src/ext/pdo/tests/bug_43130.phpt diff -u php-src/ext/pdo/tests/bug_43130.phpt:1.1.4.3 php-src/ext/pdo/tests/bug_43130.phpt:1.1.4.4 --- php-src/ext/pdo/tests/bug_43130.phpt:1.1.4.3Tue Oct 30 23:03:54 2007 +++ php-src/ext/pdo/tests/bug_43130.phptTue Nov 27 06:44:32 2007 @@ -27,5 +27,7 @@ $stmt-execute(); var_dump($stmt-fetch(PDO::FETCH_COLUMN)); ? ---EXPECT-- -string(5) test1 +--EXPECTF-- +Warning: PDOStatement::execute(): SQLSTATE[HY093]: Invalid parameter number: parameter was not defined in %s on line %d + +Warning: PDOStatement::execute(): SQLSTATE[HY093]: Invalid parameter number in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php