[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Nov 4 01:32:18 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3217r2=1.3218diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3217 php-src/ChangeLog:1.3218 --- php-src/ChangeLog:1.3217Mon Nov 3 01:32:09 2008 +++ php-src/ChangeLog Tue Nov 4 01:32:17 2008 @@ -1,3 +1,202 @@ +2008-11-03 Felipe Pena [EMAIL PROTECTED] + +* ext/pdo/pdo_stmt.c + ext/pdo_sqlite/tests/bug44327_3.phpt + ext/pdo_sqlite/tests/bug44327_3.phpt + ext/pdo_sqlite/tests/bug44327_3.phpt: + - Improved fix + +2008-11-03 Arnaud Le Blanc [EMAIL PROTECTED] + +* ext/standard/tests/file/bug44607.phpt + ext/standard/tests/file/bug44607.phpt + ext/standard/tests/file/bug44607.phpt: + cleanup + +* (PHP_5_2) + NEWS + ext/standard/tests/file/bug44607.phpt + ext/standard/tests/file/bug44607.phpt + main/streams/streams.c + main/streams/streams.c: + MFH: Fixed bug #44607 (stream_get_line unable to correctly identify the + ending in the stream content) + +* ext/standard/tests/file/bug44607.phpt + ext/standard/tests/file/bug44607.phpt + ext/standard/tests/file/bug44607.phpt + main/streams/streams.c: +1.1.4; + Fixed bug #44607 (stream_get_line unable to correctly identify the + ending in the stream content) + +* (PHP_5_2) + NEWS + sapi/cgi/cgi_main.c + sapi/cli/php_cli.c: + Fixed bug #46379 (Infinite loop when parsing '#' in one line file) + +2008-11-03 Felipe Pena [EMAIL PROTECTED] + +* ext/pdo_sqlite/tests/bug44327_2.phpt: + - Fix test (string - unicode) + +* (PHP_5_2) + ext/pdo_sqlite/tests/bug44327_2.phpt + ext/pdo_sqlite/tests/bug44327_2.phpt: + - New test + +* ext/pdo_sqlite/tests/bug44327_2.phpt + ext/pdo_sqlite/tests/bug44327_2.phpt + ext/pdo_sqlite/tests/bug44327_2.phpt: +1.1.4; + - New test + +* (PHP_5_2) + NEWS + ext/pdo/pdo_stmt.c + ext/pdo/pdo_stmt.c + ext/pdo_sqlite/tests/debugdumpparams_001.phpt + ext/pdo_sqlite/tests/debugdumpparams_001.phpt: + MFH: + - Fixed endless loop in PDOStatement::debugDumpParams() +patch by: Jonah H. Harris jonah.harris at gmail dot com + +* ext/pdo/pdo_stmt.c + ext/pdo_sqlite/tests/debugdumpparams_001.phpt + ext/pdo_sqlite/tests/debugdumpparams_001.phpt + ext/pdo_sqlite/tests/debugdumpparams_001.phpt: + - Fixed endless loop in PDOStatement::debugDumpParams() +patch by: Jonah H. Harris jonah.harris at gmail dot com + +2008-11-03 Johannes Schlüter [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/zend_compile.c + ZendEngine2/tests/closure_027.phpt + ZendEngine2/tests/closure_032.phpt: + MFH: Use a better function name for closure related errors and + debug_backtrace() + +* ZendEngine2/zend_compile.c + ZendEngine2/tests/closure_027.phpt + ZendEngine2/tests/closure_032.phpt + ZendEngine2/tests/closure_032.phpt: + Use a better function name for closure related errors and debug_backtrace() + +2008-11-03 Elizabeth Marie Smith [EMAIL PROTECTED] + +* win32/build/template.rc: + Actual name of the file is WinResRc.h - silly to make people rename their + header files + +2008-11-03 Andrey Hristov [EMAIL PROTECTED] + +* ext/mysqlnd/config-win.h: + Fix the windows build + +2008-11-03 Felipe Pena [EMAIL PROTECTED] + +* ext/pgsql/pgsql.c: + - Fixed compiler warning + +2008-11-03 Arnaud Le Blanc [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/standard/tests/file/bug45303.phpt + ext/standard/tests/file/bug45303.phpt + main/streams/plain_wrapper.c + main/streams/plain_wrapper.c: + MFH: Fixed bug #45303 (Opening php:// wrapper in append mode results + in a warning) + +* ext/standard/tests/file/bug45303.phpt + ext/standard/tests/file/bug45303.phpt + ext/standard/tests/file/bug45303.phpt: +1.1.4; + Fixed bug #45303 (Opening php:// wrapper in append mode results + in a warning) + +* main/streams/plain_wrapper.c: + Fixed bug #45303 (Opening php:// wrapper in append mode results + in a warning) + +* (PHP_5_2) + NEWS: + credit + +* (PHP_5_2) + NEWS + ext/standard/tests/file/bug43353.phpt + ext/standard/tests/file/bug43353.phpt + main/streams/streams.c + main/streams/streams.c: + MFH: Fixed bug #43353 (wrong detection of 'data' wrapper causes notice) + +* ext/standard/tests/file/bug43353.phpt + ext/standard/tests/file/bug43353.phpt + ext/standard/tests/file/bug43353.phpt + main/streams/streams.c: +1.1.4; + Fixed bug #43353 (wrong detection of 'data' wrapper causes notice) + +2008-11-03 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Nov 4 01:32:23 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1390r2=1.1391diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1390 ZendEngine2/ChangeLog:1.1391 --- ZendEngine2/ChangeLog:1.1390Mon Nov 3 01:32:13 2008 +++ ZendEngine2/ChangeLog Tue Nov 4 01:32:22 2008 @@ -1,3 +1,18 @@ +2008-11-03 Johannes Schlüter [EMAIL PROTECTED] + +* (PHP_5_3) + zend_compile.c + tests/closure_027.phpt + tests/closure_032.phpt: + MFH: Use a better function name for closure related errors and + debug_backtrace() + +* zend_compile.c + tests/closure_027.phpt + tests/closure_032.phpt + tests/closure_032.phpt: + Use a better function name for closure related errors and debug_backtrace() + 2008-11-02 Arnaud Le Blanc [EMAIL PROTECTED] * (PHP_5_3) @@ -26240,7 +26255,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1390 2008/11/03 01:32:13 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1391 2008/11/04 01:32:22 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -27964,7 +27979,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1390 2008/11/03 01:32:13 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1391 2008/11/04 01:32:22 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: CVSROOT / avail
pajoye Mon Nov 3 13:47:27 2008 UTC Modified files: /CVSROOTavail Log: - karmas for php-windows-web http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1462r2=1.1463diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1462 CVSROOT/avail:1.1463 --- CVSROOT/avail:1.1462Sun Nov 2 16:46:01 2008 +++ CVSROOT/avail Mon Nov 3 13:47:26 2008 @@ -346,7 +346,7 @@ # php-internals-win karma avail|pajoye,rrichards,auroraeosrose|php-internals-win -avail|pajoye,guilhermeblanco|phpwinweb +avail|pajoye,guilhermeblanco,auroraeosrose,rrichards|php-windows-web # SVN conversion repo avail|gwynne|SVNROOT -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c /ext/ctype ctype.c /ext/curl interface.c /ext/da
Hello Felipe, please put the static back where it belongs. 5.3 is the only time where we can fix it. If someone complains, they should first understand waht we do here and second understand that we cannot change it extension after extension at random points in time. When putting it back, it might make sense to change the order to 'static const' rather than 'const static'. marcus Sunday, November 2, 2008, 10:19:41 PM, you wrote: felipe Sun Nov 2 21:19:41 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/pcre/tests skip.ini skip_001.inc skip_002.inc skip_003.inc Modified files: /php-srcrun-tests.php /ZendEngine2zend_API.h zend_builtin_functions.c zend_exceptions.c zend_interfaces.c /php-src/ext/bcmath bcmath.c /php-src/ext/bz2bz2.c /php-src/ext/calendar calendar.c /php-src/ext/com_dotnet com_extension.c /php-src/ext/ctype ctype.c /php-src/ext/curl interface.c /php-src/ext/date php_date.c /php-src/ext/dbadba.c /php-src/ext/domattr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c domconfiguration.c domerrorhandler.c domimplementation.c domimplementationlist.c domimplementationsource.c domstringlist.c element.c entityreference.c namednodemap.c namelist.c node.c nodelist.c php_dom.c processinginstruction.c string_extend.c text.c xpath.c /php-src/ext/ereg ereg.c /php-src/ext/exif exif.c /php-src/ext/fileinfo fileinfo.c /php-src/ext/filter filter.c /php-src/ext/ftpphp_ftp.c /php-src/ext/gd gd.c /php-src/ext/gettextgettext.c /php-src/ext/gmpgmp.c /php-src/ext/hash hash.c /php-src/ext/iconv iconv.c /php-src/ext/imap php_imap.c /php-src/ext/interbase interbase.c /php-src/ext/intl php_intl.c /php-src/ext/intl/collator collator_class.c /php-src/ext/intl/dateformatdateformat_class.c /php-src/ext/intl/formatter formatter_class.c /php-src/ext/intl/localelocale_class.c /php-src/ext/intl/msgformat msgformat_class.c /php-src/ext/intl/normalizernormalizer_class.c /php-src/ext/json json.c /php-src/ext/ldap ldap.c /php-src/ext/libxml libxml.c /php-src/ext/mbstring mbstring.c /php-src/ext/mcrypt mcrypt.c /php-src/ext/msql php_msql.c /php-src/ext/mssql php_mssql.c /php-src/ext/mysqli mysqli_fe.c /php-src/ext/oci8 oci8.c /php-src/ext/odbc birdstep.c php_odbc.c /php-src/ext/opensslopenssl.c /php-src/ext/pcntl pcntl.c /php-src/ext/pcre php_pcre.c /php-src/ext/pcre/tests 007.phpt backtrack_limit.phpt bug27103.phpt invalid_utf8.phpt invalid_utf8_offset.phpt locales.phpt pcre_anchored.phpt preg_replace2.phpt recursion_limit.phpt /php-src/ext/pdopdo.c pdo_stmt.c /php-src/ext/pgsql pgsql.c /php-src/ext/phar phar_object.c /php-src/ext/posix posix.c /php-src/ext/pspell pspell.c /php-src/ext/readline readline.c /php-src/ext/recode recode.c /php-src/ext/reflection php_reflection.c /php-src/ext/sessionsession.c /php-src/ext/shmop shmop.c /php-src/ext/simplexml simplexml.c /php-src/ext/snmp snmp.c /php-src/ext/soap soap.c /php-src/ext/socketssockets.c /php-src/ext/splphp_spl.c spl_array.c spl_directory.c spl_dllist.c spl_fixedarray.c spl_heap.c spl_iterators.c spl_observer.c /php-src/ext/sqlite sqlite.c /php-src/ext/sqlite3sqlite3.c /php-src/ext/standard basic_functions.c user_filters.c /php-src/ext/sybase_ct php_sybase_ct.c /php-src/ext/sysvmsgsysvmsg.c /php-src/ext/sysvsemsysvsem.c /php-src/ext/sysvshmsysvshm.c /php-src/ext/tidy tidy.c /php-src/ext/tokenizer tokenizer.c /php-src/ext/wddx wddx.c /php-src/ext/xmlxml.c /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/xmlrpc xmlrpc-epi-php.c /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/xslxsltprocessor.c /php-src/ext/zipphp_zip.c /php-src/ext/zlib zlib.c /php-src/sapi/aolserver aolserver.c /php-src/sapi/apachephp_apache.c /php-src/sapi/apache2filter php_functions.c /php-src/sapi/apache2handler
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php /ext/pcre/tests 007.phpt backtrack_limit.phpt bug27103.phpt invalid_utf8.phpt invalid_utf8_offset.phpt locales.phpt pcre_anchored.phpt preg_replace2.ph
felipe Mon Nov 3 13:07:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
/php-src/ext/pcre/tests 007.phpt backtrack_limit.phpt bug27103.phpt
invalid_utf8.phpt invalid_utf8_offset.phpt
locales.phpt pcre_anchored.phpt
preg_replace2.phpt recursion_limit.phpt
Log:
- Opss, reverted accidental changes
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.50r2=1.226.2.37.2.35.2.51diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.50
php-src/run-tests.php:1.226.2.37.2.35.2.51
--- php-src/run-tests.php:1.226.2.37.2.35.2.50 Sun Nov 2 21:19:30 2008
+++ php-src/run-tests.php Mon Nov 3 13:07:28 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.50 2008/11/02 21:19:30 felipe Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.51 2008/11/03 13:07:28 felipe 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
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.50
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.51
$' . \n;
exit(1);
default:
@@ -814,24 +814,6 @@
find_files($dir, ($dir == 'ext'));
}
-function find_ini_skip($path)
-{
- $skip_dir = $path;
- $cwd = getcwd();
-
- do {
- if (in_array(basename($skip_dir), array('Zend', 'ext', '')) ||
$skip_dir == $cwd) {
- break;
- }
- $ini_skip_file = $skip_dir .'/skip.ini';
- if (file_exists($ini_skip_file)) {
- return $ini_skip_file;
- }
- } while ($skip_dir = dirname($skip_dir));
-
- return false;
-}
-
function find_files($dir, $is_ext_dir = false, $ignore = false)
{
global $test_files, $exts_to_test, $ignored_by_ext, $exts_skipped,
$exts_tested;
@@ -1403,56 +1385,21 @@
// Check if test should be skipped.
$info = '';
$warn = false;
- $skip_codes = array();
-
- /* Using skip.ini */
- if ($skip_ini = find_ini_skip($file)) {
- $ini = parse_ini_file($skip_ini, true);
-
- /* Skip on 32-bit architecture */
- if (PHP_INT_SIZE == 4 isset($ini['SKIP_32']['test'])
-in_array(basename($file), $ini['SKIP_32']['test'])) {
- show_result('SKIP', $tested, $tested_file, 'This test
is for non 32-bit', $temp_filenames);
- return 'SKIPPED';
- }
- /* Skip on 64-bit architecture */
- if (PHP_INT_SIZE != 4 isset($ini['SKIP_64']['test'])
-in_array(basename($file), $ini['SKIP_64']['test'])) {
- show_result('SKIP', $tested, $tested_file, 'This test
is for 32-bit only', $temp_filenames);
- return 'SKIPPED';
- }
-
- $labels = array_keys($ini);
- foreach ($labels as $label) {
- if (in_array($label, array('SKIP_32', 'SKIP_64'))) {
- continue;
- }
- if (isset($ini[$label]['skip'])
isset($ini[$label]['test'])) {
- if (!in_array(basename($file),
$ini[$label]['test'])) {
- continue;
- }
- $code = '?php ';
- foreach ($ini[$label]['skip'] as $skip_file) {
- $code .= 'require_once '. $skip_file
.';';
- }
- $skip_codes[$label] = $code;
+
+ if (array_key_exists('SKIPIF', $section_text)) {
+
+ if (trim($section_text['SKIPIF'])) {
+ show_file_block('skip', $section_text['SKIPIF']);
+ save_text($test_skipif, $section_text['SKIPIF'],
$temp_skipif);
+ $extra = substr(PHP_OS, 0, 3) !== WIN ?
+ unset REQUEST_METHOD; unset QUERY_STRING;
unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;: ;
+
+ if ($leak_check) {
+ $env['USE_ZEND_ALLOC'] = '0';
+
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c /ext/ctype ctype.c /ext/curl interface.c /ext/da
Felipe Pena wrote: felipe Sun Nov 2 21:19:41 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/pcre/tests skip.ini skip_001.inc skip_002.inc skip_003.inc Modified files: /php-src run-tests.php What does this run-tests.php change do here? Looks like you made the file out-of-sync now with HEAD and PHP_5_2.. --Jani /ZendEngine2 zend_API.h zend_builtin_functions.c zend_exceptions.c zend_interfaces.c /php-src/ext/bcmath bcmath.c /php-src/ext/bz2 bz2.c /php-src/ext/calendar calendar.c /php-src/ext/com_dotnet com_extension.c /php-src/ext/ctype ctype.c /php-src/ext/curl interface.c /php-src/ext/date php_date.c /php-src/ext/dba dba.c /php-src/ext/dom attr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c domconfiguration.c domerrorhandler.c domimplementation.c domimplementationlist.c domimplementationsource.c domstringlist.c element.c entityreference.c namednodemap.c namelist.c node.c nodelist.c php_dom.c processinginstruction.c string_extend.c text.c xpath.c /php-src/ext/ereg ereg.c /php-src/ext/exif exif.c /php-src/ext/fileinfo fileinfo.c /php-src/ext/filter filter.c /php-src/ext/ftp php_ftp.c /php-src/ext/gd gd.c /php-src/ext/gettext gettext.c /php-src/ext/gmp gmp.c /php-src/ext/hash hash.c /php-src/ext/iconv iconv.c /php-src/ext/imap php_imap.c /php-src/ext/interbase interbase.c /php-src/ext/intl php_intl.c /php-src/ext/intl/collator collator_class.c /php-src/ext/intl/dateformat dateformat_class.c /php-src/ext/intl/formatter formatter_class.c /php-src/ext/intl/locale locale_class.c /php-src/ext/intl/msgformat msgformat_class.c /php-src/ext/intl/normalizer normalizer_class.c /php-src/ext/json json.c /php-src/ext/ldap ldap.c /php-src/ext/libxml libxml.c /php-src/ext/mbstring mbstring.c /php-src/ext/mcrypt mcrypt.c /php-src/ext/msql php_msql.c /php-src/ext/mssql php_mssql.c /php-src/ext/mysqli mysqli_fe.c /php-src/ext/oci8 oci8.c /php-src/ext/odbc birdstep.c php_odbc.c /php-src/ext/openssl openssl.c /php-src/ext/pcntl pcntl.c /php-src/ext/pcre php_pcre.c /php-src/ext/pcre/tests 007.phpt backtrack_limit.phpt bug27103.phpt invalid_utf8.phpt invalid_utf8_offset.phpt locales.phpt pcre_anchored.phpt preg_replace2.phpt recursion_limit.phpt /php-src/ext/pdo pdo.c pdo_stmt.c /php-src/ext/pgsql pgsql.c /php-src/ext/phar phar_object.c /php-src/ext/posix posix.c /php-src/ext/pspell pspell.c /php-src/ext/readline readline.c /php-src/ext/recode recode.c /php-src/ext/reflection php_reflection.c /php-src/ext/session session.c /php-src/ext/shmop shmop.c /php-src/ext/simplexml simplexml.c /php-src/ext/snmp snmp.c /php-src/ext/soap soap.c /php-src/ext/sockets sockets.c /php-src/ext/spl php_spl.c spl_array.c spl_directory.c spl_dllist.c spl_fixedarray.c spl_heap.c spl_iterators.c spl_observer.c /php-src/ext/sqlite sqlite.c /php-src/ext/sqlite3 sqlite3.c /php-src/ext/standard basic_functions.c user_filters.c /php-src/ext/sybase_ct php_sybase_ct.c /php-src/ext/sysvmsg sysvmsg.c /php-src/ext/sysvsem sysvsem.c /php-src/ext/sysvshm sysvshm.c /php-src/ext/tidy tidy.c /php-src/ext/tokenizer tokenizer.c /php-src/ext/wddx wddx.c /php-src/ext/xml xml.c /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/xmlrpc xmlrpc-epi-php.c /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/xsl xsltprocessor.c /php-src/ext/zip php_zip.c /php-src/ext/zlib zlib.c /php-src/sapi/aolserver aolserver.c /php-src/sapi/apache php_apache.c /php-src/sapi/apache2filter php_functions.c /php-src/sapi/apache2handler php_functions.c /php-src/sapi/apache_hooks php_apache.c /php-src/sapi/milter php_milter.c /php-src/sapi/nsapi nsapi.c Log: - Revert ZEND_BEGIN_ARG_INFO change -- 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_stmt.c /ext/pdo_mysql/tests bug44327.phpt
felipe Mon Nov 3 15:31:51 2008 UTC
Added files:
/php-src/ext/pdo_mysql/testsbug44327.phpt
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
- Fixed bug #44327 (PDORow::queryString property numeric offsets / Crash)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.204r2=1.205diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.204 php-src/ext/pdo/pdo_stmt.c:1.205
--- php-src/ext/pdo/pdo_stmt.c:1.204Sun Nov 2 21:10:10 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 3 15:31:51 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.204 2008/11/02 21:10:10 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.205 2008/11/03 15:31:51 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -2622,6 +2622,10 @@
pdo_stmt_t * stmt = (pdo_stmt_t *) zend_object_store_get_object(object
TSRMLS_CC);
int colno = -1;
+ if ((Z_TYPE_P(member) == IS_STRING || Z_TYPE_P(member) == IS_UNICODE)
+ memcmp(Z_UNIVAL_P(member).v, queryString,
sizeof(queryString)-1)) {
+ return std_object_handlers.read_property(object, member,
IS_STRING TSRMLS_CC);
+ }
MAKE_STD_ZVAL(return_value);
if (Z_TYPE_P(member) == IS_LONG) {
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug44327.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_mysql/tests/bug44327.phpt
+++ php-src/ext/pdo_mysql/tests/bug44327.phpt
--TEST--
Bug #44327 (PDORow::queryString property numeric offsets / Crash)
--SKIPIF--
?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
MySQLPDOTest::skip();
$db = MySQLPDOTest::factory();
?
--FILE--
?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR .
'mysql_pdo_test.inc');
$db = MySQLPDOTest::factory();
$stmt = $db-prepare(SELECT 1 AS \one\);
$stmt-execute();
$row = $stmt-fetch(PDO::FETCH_LAZY);
var_dump($row);
var_dump($row-{0});
var_dump($row-one);
var_dump($row-queryString);
print --\n;
@$db-exec(DROP TABLE test);
$db-exec(CREATE TABLE test (id INT));
$db-exec(INSERT INTO test(id) VALUES (1));
$stmt = $db-prepare(SELECT id FROM test);
$stmt-execute();
$row = $stmt-fetch(PDO::FETCH_LAZY);
var_dump($row);
var_dump($row-queryString);
@$db-exec(DROP TABLE test);
print --\n;
$stmt = $db-prepare('foo');
@$stmt-execute();
$row = $stmt-fetch();
var_dump($row-queryString);
?
--EXPECTF--
object(PDORow)#%d (2) {
[queryString]=
string(17) SELECT 1 AS one
[one]=
string(1) 1
}
string(1) 1
string(1) 1
string(17) SELECT 1 AS one
--
object(PDORow)#%d (2) {
[queryString]=
string(19) SELECT id FROM test
[id]=
string(1) 1
}
string(19) SELECT id FROM test
--
Notice: Trying to get property of non-object in %s on line %d
NULL
--
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_stmt.c /ext/pdo_mysql/tests bug44327.phpt
felipe Mon Nov 3 15:33:23 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pdo_mysql/testsbug44327.phpt
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
- MFH: Fixed bug #44327 (PDORow::queryString property numeric offsets /
Crash)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.30r2=1.118.2.38.2.24.2.31diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.30
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.31
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.30 Sun Nov 2 21:19:35 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 3 15:33:22 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.30 2008/11/02 21:19:35 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.31 2008/11/03 15:33:22 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -2614,6 +2614,9 @@
pdo_stmt_t * stmt = (pdo_stmt_t *) zend_object_store_get_object(object
TSRMLS_CC);
int colno = -1;
+ if (Z_TYPE_P(member) == IS_STRING strcmp(Z_STRVAL_P(member),
queryString) == 0) {
+ return std_object_handlers.read_property(object, member,
IS_STRING TSRMLS_CC);
+ }
MAKE_STD_ZVAL(return_value);
if (Z_TYPE_P(member) == IS_LONG) {
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug44327.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_mysql/tests/bug44327.phpt
+++ php-src/ext/pdo_mysql/tests/bug44327.phpt
--TEST--
Bug #44327 (PDORow::queryString property numeric offsets / Crash)
--SKIPIF--
?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
MySQLPDOTest::skip();
$db = MySQLPDOTest::factory();
?
--FILE--
?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR .
'mysql_pdo_test.inc');
$db = MySQLPDOTest::factory();
$stmt = $db-prepare(SELECT 1 AS \one\);
$stmt-execute();
$row = $stmt-fetch(PDO::FETCH_LAZY);
var_dump($row);
var_dump($row-{0});
var_dump($row-one);
var_dump($row-queryString);
print --\n;
@$db-exec(DROP TABLE test);
$db-exec(CREATE TABLE test (id INT));
$db-exec(INSERT INTO test(id) VALUES (1));
$stmt = $db-prepare(SELECT id FROM test);
$stmt-execute();
$row = $stmt-fetch(PDO::FETCH_LAZY);
var_dump($row);
var_dump($row-queryString);
@$db-exec(DROP TABLE test);
print --\n;
$stmt = $db-prepare('foo');
@$stmt-execute();
$row = $stmt-fetch();
var_dump($row-queryString);
?
--EXPECTF--
object(PDORow)#%d (2) {
[queryString]=
string(17) SELECT 1 AS one
[one]=
string(1) 1
}
string(1) 1
string(1) 1
string(17) SELECT 1 AS one
--
object(PDORow)#%d (2) {
[queryString]=
string(19) SELECT id FROM test
[id]=
string(1) 1
}
string(19) SELECT id FROM test
--
Notice: Trying to get property of non-object in %s on line %d
NULL
--
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 /ext/pdo_mysql/tests bug44327.phpt
felipe Mon Nov 3 15:41:36 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/pdo_mysql/testsbug44327.phpt
Modified files:
/php-src/ext/pdopdo_stmt.c
/php-srcNEWS
Log:
- MFH: Fixed bug #44327 (PDORow::queryString property numeric offsets /
Crash)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.41r2=1.118.2.38.2.42diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.41
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.42
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.41 Tue Oct 14 17:43:19 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 3 15:41:35 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.41 2008/10/14 17:43:19 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.42 2008/11/03 15:41:35 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -2595,6 +2595,9 @@
pdo_stmt_t * stmt = (pdo_stmt_t *) zend_object_store_get_object(object
TSRMLS_CC);
int colno = -1;
+ if (Z_TYPE_P(member) == IS_STRING strcmp(Z_STRVAL_P(member),
queryString) == 0) {
+ return std_object_handlers.read_property(object, member,
IS_STRING TSRMLS_CC);
+ }
MAKE_STD_ZVAL(return_value);
if (Z_TYPE_P(member) == IS_LONG) {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1293r2=1.2027.2.547.2.1294diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1293 php-src/NEWS:1.2027.2.547.2.1294
--- php-src/NEWS:1.2027.2.547.2.1293Mon Nov 3 11:39:34 2008
+++ php-src/NEWSMon Nov 3 15:41:35 2008
@@ -23,6 +23,8 @@
different). (Derick)
- Fixed bug #44938 (gettext functions crash with overly long domain).
(Christian Schneider, Ilia)
+- Fixed bug #44327 (PDORow::queryString property numeric offsets / Crash).
+ (Felipe)
- Fixed bug #43452 (strings containing a weekday, or a number plus weekday
behaved incorrect of the current day-of-week was the same as the one in the
phrase).(Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug44327.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_mysql/tests/bug44327.phpt
+++ php-src/ext/pdo_mysql/tests/bug44327.phpt
--TEST--
Bug #44327 (PDORow::queryString property numeric offsets / Crash)
--SKIPIF--
?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
MySQLPDOTest::skip();
$db = MySQLPDOTest::factory();
?
--FILE--
?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR .
'mysql_pdo_test.inc');
$db = MySQLPDOTest::factory();
$stmt = $db-prepare(SELECT 1 AS \one\);
$stmt-execute();
$row = $stmt-fetch(PDO::FETCH_LAZY);
var_dump($row);
var_dump($row-{0});
var_dump($row-one);
var_dump($row-queryString);
print --\n;
@$db-exec(DROP TABLE test);
$db-exec(CREATE TABLE test (id INT));
$db-exec(INSERT INTO test(id) VALUES (1));
$stmt = $db-prepare(SELECT id FROM test);
$stmt-execute();
$row = $stmt-fetch(PDO::FETCH_LAZY);
var_dump($row);
var_dump($row-queryString);
@$db-exec(DROP TABLE test);
print --\n;
$stmt = $db-prepare('foo');
@$stmt-execute();
$row = $stmt-fetch();
var_dump($row-queryString);
?
--EXPECTF--
object(PDORow)#%d (2) {
[queryString]=
string(17) SELECT 1 AS one
[one]=
string(1) 1
}
string(1) 1
string(1) 1
string(17) SELECT 1 AS one
--
object(PDORow)#%d (2) {
[queryString]=
string(19) SELECT id FROM test
[id]=
string(1) 1
}
string(19) SELECT id FROM test
--
Notice: Trying to get property of non-object in %s on line %d
NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file bug43353.phpt /main/streams streams.c
lbarnaudMon Nov 3 15:47:05 2008 UTC
Added files:
/php-src/ext/standard/tests/filebug43353.phpt
Modified files:
/php-src/main/streams streams.c
Log:
Fixed bug #43353 (wrong detection of 'data' wrapper causes notice)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.170r2=1.171diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.170
php-src/main/streams/streams.c:1.171
--- php-src/main/streams/streams.c:1.170Mon Sep 22 01:26:38 2008
+++ php-src/main/streams/streams.c Mon Nov 3 15:47:05 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.170 2008/09/22 01:26:38 cellog Exp $ */
+/* $Id: streams.c,v 1.171 2008/11/03 15:47:05 lbarnaud Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -2076,7 +2076,7 @@
n++;
}
- if ((*p == ':') (n 1) (!strncmp(//, p+1, 2) ||
!memcmp(data, path, 4))) {
+ if ((*p == ':') (n 1) (!strncmp(//, p+1, 2) || (n == 4
!memcmp(data:, path, 5 {
protocol = path;
} else if (n == 5 strncasecmp(path, zlib:, 5) == 0) {
/* BC with older php scripts and zlib wrapper */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43353.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug43353.phpt
+++ php-src/ext/standard/tests/file/bug43353.phpt
--TEST--
Bug #43353 wrong detection of 'data' wrapper
--FILE--
?php
var_dump(is_dir('file:///datafoo:test'));
var_dump(is_dir('datafoo:test'));
var_dump(file_get_contents('data:text/plain,foo'));
var_dump(file_get_contents('datafoo:text/plain,foo'));
?
--EXPECTF--
bool(false)
bool(false)
string(3) foo
Warning: file_get_contents(datafoo:text/plain,foo): failed to open stream: No
such file or directory in %s
bool(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_3) /ext/standard/tests/file bug43353.phpt /main/streams streams.c
lbarnaudMon Nov 3 15:47:31 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filebug43353.phpt
Modified files:
/php-src/main/streams streams.c
Log:
MFH: Fixed bug #43353 (wrong detection of 'data' wrapper causes notice)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.15r2=1.82.2.6.2.18.2.16diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.15
php-src/main/streams/streams.c:1.82.2.6.2.18.2.16
--- php-src/main/streams/streams.c:1.82.2.6.2.18.2.15 Mon Sep 22 01:26:14 2008
+++ php-src/main/streams/streams.c Mon Nov 3 15:47:31 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.18.2.15 2008/09/22 01:26:14 cellog Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18.2.16 2008/11/03 15:47:31 lbarnaud Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1521,7 +1521,7 @@
n++;
}
- if ((*p == ':') (n 1) (!strncmp(//, p+1, 2) ||
!memcmp(data, path, 4))) {
+ if ((*p == ':') (n 1) (!strncmp(//, p+1, 2) || (n == 4
!memcmp(data:, path, 5 {
protocol = path;
} else if (n == 5 strncasecmp(path, zlib:, 5) == 0) {
/* BC with older php scripts and zlib wrapper */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43353.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug43353.phpt
+++ php-src/ext/standard/tests/file/bug43353.phpt
--TEST--
Bug #43353 wrong detection of 'data' wrapper
--FILE--
?php
var_dump(is_dir('file:///datafoo:test'));
var_dump(is_dir('datafoo:test'));
var_dump(file_get_contents('data:text/plain,foo'));
var_dump(file_get_contents('datafoo:text/plain,foo'));
?
--EXPECTF--
bool(false)
bool(false)
string(3) foo
Warning: file_get_contents(datafoo:text/plain,foo): failed to open stream: No
such file or directory in %s
bool(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) / NEWS /ext/standard/tests/file bug43353.phpt /main/streams streams.c
lbarnaudMon Nov 3 15:48:05 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filebug43353.phpt
Modified files:
/php-srcNEWS
/php-src/main/streams streams.c
Log:
MFH: Fixed bug #43353 (wrong detection of 'data' wrapper causes notice)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1294r2=1.2027.2.547.2.1295diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1294 php-src/NEWS:1.2027.2.547.2.1295
--- php-src/NEWS:1.2027.2.547.2.1294Mon Nov 3 15:41:35 2008
+++ php-src/NEWSMon Nov 3 15:48:05 2008
@@ -28,6 +28,7 @@
- Fixed bug #43452 (strings containing a weekday, or a number plus weekday
behaved incorrect of the current day-of-week was the same as the one in the
phrase).(Derick)
+- Fixed bug #43353 (wrong detection of 'data' wrapper causes notice). (Arnaud)
- Fixed bug #42855 (dns_get_record() doesn't return all text from TXT record).
(a dot u dot savchuk at gmail dot com)
- Fixed bug #42718 (FILTER_UNSAFE_RAW not applied when configured as default
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.26r2=1.82.2.6.2.27diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.26
php-src/main/streams/streams.c:1.82.2.6.2.27
--- php-src/main/streams/streams.c:1.82.2.6.2.26Mon Sep 22 01:25:44 2008
+++ php-src/main/streams/streams.c Mon Nov 3 15:48:05 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.26 2008/09/22 01:25:44 cellog Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.27 2008/11/03 15:48:05 lbarnaud Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1511,7 +1511,7 @@
n++;
}
- if ((*p == ':') (n 1) (!strncmp(//, p+1, 2) ||
!memcmp(data, path, 4))) {
+ if ((*p == ':') (n 1) (!strncmp(//, p+1, 2) || (n == 4
!memcmp(data:, path, 5 {
protocol = path;
} else if (n == 5 strncasecmp(path, zlib:, 5) == 0) {
/* BC with older php scripts and zlib wrapper */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43353.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug43353.phpt
+++ php-src/ext/standard/tests/file/bug43353.phpt
--TEST--
Bug #43353 wrong detection of 'data' wrapper
--FILE--
?php
var_dump(is_dir('file:///datafoo:test'));
var_dump(is_dir('datafoo:test'));
var_dump(file_get_contents('data:text/plain,foo'));
var_dump(file_get_contents('datafoo:text/plain,foo'));
?
--EXPECTF--
bool(false)
bool(false)
string(3) foo
Warning: file_get_contents(datafoo:text/plain,foo): failed to open stream: No
such file or directory in %s
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_3) / NEWS /ext/standard/tests/general_functions parse_ini_file.phpt ZendEngine2 zend_ini_scanner.l
Hi,
On Monday 03 November 2008 12:17:44 you wrote:
Not sure if I agree with this change, it has never meant to work and
doesn't work with any of the ini parsers in other languages.
It works in 5.2 and some people seems to rely on it, and some text editors
also highlight lines starting with # as comments in .ini files.
If anything I would make it an E_NOTICE.
It depends if # comments are to be removed in future releases or not. There is
a TODO on ini parser to add support for #if/#else/#include constructs, which
is likely to conflicts with #comments.
Regards,
Arnaud
Scott
Arnaud Le Blanc wrote:
lbarnaudSun Nov 2 23:36:10 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/ZendEngine2zend_ini_scanner.l
/php-src/ext/standard/tests/general_functions parse_ini_file.phpt
Log:
Fixed bug #44575 (parse_ini_file comment # line problems)
[DOC] parse_ini_file(): comments starting with # are deprecated in PHP
5.3
(comments starting with ; should be used instead)
http://cvs.php.net/viewvc.cgi/php-
src/NEWS?r1=1.2027.2.547.2.965.2.358r2=1.2027.2.547.2.965.2.359diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.358 php-
src/NEWS:1.2027.2.547.2.965.2.359
--- php-src/NEWS:1.2027.2.547.2.965.2.358 Sun Nov 2 23:06:27 2008
+++ php-src/NEWSSun Nov 2 23:36:10 2008
@@ -59,6 +59,7 @@
- Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit). (Ilia)
- Fixed bug #45382 (timeout bug in stream_socket_enable_crypto).
(vnegrier at optilian dot com, Ilia)
+- Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud)
- Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS).
(Johannes,
chx1975 at gmail dot com)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.l?r1=1.41.2.2.2.2.2.11r2=1.41.2.2.2.2.2.12diff_format=u
Index: ZendEngine2/zend_ini_scanner.l
diff -u ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.11
ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.12
--- ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.11Thu Sep 11
00:33:38
2008
+++ ZendEngine2/zend_ini_scanner.l Sun Nov 2 23:36:10 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.11 2008/09/11 00:33:38 stas
Exp $ */
+/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.12 2008/11/02 23:36:10
lbarnaud Exp $ */
#include errno.h
#include zend.h
@@ -480,6 +480,13 @@
return END_OF_LINE;
}
+INITIAL{TABS_AND_SPACES}*[#][^\r\n]*{NEWLINE} { /* #Comment */
+ zend_error(E_DEPRECATED, Comments starting with '#' are deprecated in
%s on line %d, ini_filename, SCNG(lineno));
+ BEGIN(INITIAL);
+ SCNG(lineno)++;
+ return END_OF_LINE;
+}
+
ST_VALUE,ST_RAW[^] { /* End of option value (if EOF is reached before
EOL */
BEGIN(INITIAL);
return END_OF_LINE;
http://cvs.php.net/viewvc.cgi/php-
src/ext/standard/tests/general_functions/parse_ini_file.phpt?r1=1.1.2.2.2.5r2=1.1.2.2.2.6diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_file.phpt
diff -u php-
src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.5 php-
src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.6
--- php-
src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.5
Sun
Aug 31 00:19:50 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_file.phpt
Sun
Nov 2 23:36:10 2008
@@ -105,6 +105,18 @@
file_put_contents($filename, $ini);
var_dump(parse_ini_file($filename, true));
+/* #44575, comments starting with '#' */
+$ini = 'INI'
+foo=bar1
+; comment
+_foo=bar2
+# comment
+foo_=bar3
+INI;
+file_put_contents($filename, $ini);
+var_dump(parse_ini_file($filename, true));
+
+
@unlink($filename);
echo Done\n;
?
@@ -193,4 +205,14 @@
[foo_]=
string(4) bar3
}
+
+Deprecated: Comments starting with '#' are deprecated in %s
+array(3) {
+ [foo]=
+ string(4) bar1
+ [_foo]=
+ string(4) bar2
+ [foo_]=
+ string(4) bar3
+}
Done
--
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
lbarnaudMon Nov 3 16:08:08 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: credit http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1295r2=1.2027.2.547.2.1296diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1295 php-src/NEWS:1.2027.2.547.2.1296 --- php-src/NEWS:1.2027.2.547.2.1295Mon Nov 3 15:48:05 2008 +++ php-src/NEWSMon Nov 3 16:08:07 2008 @@ -28,7 +28,8 @@ - Fixed bug #43452 (strings containing a weekday, or a number plus weekday behaved incorrect of the current day-of-week was the same as the one in the phrase).(Derick) -- Fixed bug #43353 (wrong detection of 'data' wrapper causes notice). (Arnaud) +- Fixed bug #43353 (wrong detection of 'data' wrapper causes notice). + (gk at gknw dot de, Arnaud) - Fixed bug #42855 (dns_get_record() doesn't return all text from TXT record). (a dot u dot savchuk at gmail dot com) - Fixed bug #42718 (FILTER_UNSAFE_RAW not applied when configured as default -- 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) / NEWS
janiMon Nov 3 12:03:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Fix order (this is not rocket science.. :-p ) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.359r2=1.2027.2.547.2.965.2.360diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.359 php-src/NEWS:1.2027.2.547.2.965.2.360 --- php-src/NEWS:1.2027.2.547.2.965.2.359 Sun Nov 2 23:36:10 2008 +++ php-src/NEWSMon Nov 3 12:03:46 2008 @@ -3,13 +3,12 @@ ?? ??? 200?, PHP 5.3.0 Alpha 3 - Upgraded bundled PCRE to version 7.8. (Nuno) - Upgraded bundled sqlite to version 3.6.2. (Scott) + - Changed error level E_ERROR into E_WARNING in Soap extension methods parameter validation. (Felipe) - -- Added str_getcsv() function. (Sara) - - Changed openssl info to show the shared library version number. (Scott) +- Added str_getcsv() function. (Sara) - Added ability to send user defined HTTP headers with SOAP request. (Brian J.France, Dmitry) - Added concatenation option to bz2.decompress stream filter. -- 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/standard dns.c
felipe Mon Nov 3 11:35:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c
Log:
- MFH: Fixed bug #42855 (dns_get_record() doesn't return all text from TXT
record)
patch by: misc at e2007 dot cynergi dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.7r2=1.70.2.7.2.5.2.8diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.7
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.8
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.7 Sat Aug 23 19:22:08 2008
+++ php-src/ext/standard/dns.c Mon Nov 3 11:35:11 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.7 2008/08/23 19:22:08 pajoye Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.8 2008/11/03 11:35:11 felipe Exp $ */
/* {{{ includes */
#include php.h
@@ -446,13 +446,22 @@
cp += n;
break;
case DNS_T_TXT:
- add_assoc_string(*subarray, type, TXT, 1);
- n = cp[0];
- tp = emalloc(n + 1);
- memcpy(tp, cp + 1, n);
- tp[n] = '\0';
- cp += dlen;
- add_assoc_stringl(*subarray, txt, (char*)tp, n, 0);
+ {
+ int ll = 0;
+
+ add_assoc_string(*subarray, type, TXT, 1);
+ tp = emalloc(dlen + 1);
+
+ while (ll dlen) {
+ n = cp[ll];
+ memcpy(tp + ll , cp + ll + 1, n);
+ ll = ll + n + 1;
+ }
+ tp[dlen] = '\0';
+ cp += dlen;
+
+ add_assoc_stringl(*subarray, txt, tp, dlen,
0);
+ }
break;
case DNS_T_SOA:
add_assoc_string(*subarray, type, SOA, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php-src(PHP_5_3) / NEWS /ext/standard/tests/general_functions parse_ini_file.phpt ZendEngine2 zend_ini_scanner.l
Scott MacVicar wrote:
Not sure if I agree with this change, it has never meant to work and
doesn't work with any of the ini parsers in other languages.
The point is it works in e.g. PHP 5.2.x..
--Jani
If anything I would make it an E_NOTICE.
Scott
Arnaud Le Blanc wrote:
lbarnaudSun Nov 2 23:36:10 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/ZendEngine2 zend_ini_scanner.l
/php-src/ext/standard/tests/general_functions parse_ini_file.phpt
Log:
Fixed bug #44575 (parse_ini_file comment # line problems)
[DOC] parse_ini_file(): comments starting with # are deprecated in PHP 5.3
(comments starting with ; should be used instead)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.358r2=1.2027.2.547.2.965.2.359diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.358
php-src/NEWS:1.2027.2.547.2.965.2.359
--- php-src/NEWS:1.2027.2.547.2.965.2.358 Sun Nov 2 23:06:27 2008
+++ php-src/NEWSSun Nov 2 23:36:10 2008
@@ -59,6 +59,7 @@
- Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit). (Ilia)
- Fixed bug #45382 (timeout bug in stream_socket_enable_crypto).
(vnegrier at optilian dot com, Ilia)
+- Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud)
- Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes,
chx1975 at gmail dot com)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.l?r1=1.41.2.2.2.2.2.11r2=1.41.2.2.2.2.2.12diff_format=u
Index: ZendEngine2/zend_ini_scanner.l
diff -u ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.11
ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.12
--- ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.11Thu Sep 11 00:33:38 2008
+++ ZendEngine2/zend_ini_scanner.l Sun Nov 2 23:36:10 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.11 2008/09/11 00:33:38 stas Exp $ */
+/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.12 2008/11/02 23:36:10 lbarnaud
Exp $ */
#include errno.h
#include zend.h
@@ -480,6 +480,13 @@
return END_OF_LINE;
}
+INITIAL{TABS_AND_SPACES}*[#][^\r\n]*{NEWLINE} { /* #Comment */
+ zend_error(E_DEPRECATED, Comments starting with '#' are deprecated in %s on
line %d, ini_filename, SCNG(lineno));
+ BEGIN(INITIAL);
+ SCNG(lineno)++;
+ return END_OF_LINE;
+}
+
ST_VALUE,ST_RAW[^] { /* End of option value (if EOF is reached before EOL */
BEGIN(INITIAL);
return END_OF_LINE;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_file.phpt?r1=1.1.2.2.2.5r2=1.1.2.2.2.6diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_file.phpt
diff -u
php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.5
php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.6
---
php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.5
Sun Aug 31 00:19:50 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_file.phptSun Nov
2 23:36:10 2008
@@ -105,6 +105,18 @@
file_put_contents($filename, $ini);
var_dump(parse_ini_file($filename, true));
+/* #44575, comments starting with '#' */
+$ini = 'INI'
+foo=bar1
+; comment
+_foo=bar2
+# comment
+foo_=bar3
+INI;
+file_put_contents($filename, $ini);
+var_dump(parse_ini_file($filename, true));
+
+
@unlink($filename);
echo Done\n;
?
@@ -193,4 +205,14 @@
[foo_]=
string(4) bar3
}
+
+Deprecated: Comments starting with '#' are deprecated in %s
+array(3) {
+ [foo]=
+ string(4) bar1
+ [_foo]=
+ string(4) bar2
+ [foo_]=
+ string(4) bar3
+}
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/gettext gettext.c
Antony Dovgal wrote:
tony2001Sun Nov 2 21:06:47 2008 UTC
Modified files:
/php-src/ext/gettext gettext.c
Log:
fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/gettext.c?r1=1.61r2=1.62diff_format=u
Index: php-src/ext/gettext/gettext.c
diff -u php-src/ext/gettext/gettext.c:1.61 php-src/ext/gettext/gettext.c:1.62
--- php-src/ext/gettext/gettext.c:1.61 Sat Nov 1 23:08:52 2008
+++ php-src/ext/gettext/gettext.c Sun Nov 2 21:06:46 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: gettext.c,v 1.61 2008/11/01 23:08:52 jani Exp $ */
+/* $Id: gettext.c,v 1.62 2008/11/02 21:06:46 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -274,10 +274,10 @@
PHP_NAMED_FUNCTION(zif_ngettext)
{
char *msgid_str1, *msgid_str2, *msgstr;
- int msgid_len1, msgid_len2;
+ int msgid1_len, msgid2_len;
long count;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ssl, msgid_str1, msgid_len1, UG(ascii_conv), msgid_str2, msgid_len2, UG(ascii_conv), count)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ssl, msgid_str1,
msgid1_len, UG(ascii_conv), msgid_str2, msgid2_len, UG(ascii_conv), count)) {
RETURN_FALSE;
}
@@ -299,10 +299,10 @@
PHP_NAMED_FUNCTION(zif_dngettext)
{
char *domain_str, *msgid_str1, *msgid_str2, *msgstr;
- int domain_len, msgid_len1, msgid_len2;
+ int domain_len, msgid1_len, msgid2_len;
long count;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sssl, domain_str,
domain_len, ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), msgid_str1, msgid_len1, UG(ascii_conv),
msgid_str2, msgid_len2, UG(ascii_conv), count)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sssl, domain_str,
domain_len, ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), msgid_str1, msgid1_len, UG(ascii_conv),
msgid_str2, msgid2_len, UG(ascii_conv), count)) {
RETURN_FALSE;
}
@@ -325,10 +325,10 @@
PHP_NAMED_FUNCTION(zif_dcngettext)
{
char *domain_str, *msgid_str1, *msgid_str2, *msgstr;
- int domain_len, msgid_len1, msgid_len2;
+ int domain_len, msgid1_len, msgid2_len;
long count, category;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sssll, domain_str,
domain_len, ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), msgid_str1, msgid_len1, UG(ascii_conv), msgid_str2,
msgid_len2, UG(ascii_conv), count, category)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sssll, domain_str,
domain_len, ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), msgid_str1, msgid1_len, UG(ascii_conv), msgid_str2,
msgid2_len, UG(ascii_conv), count, category)) {
RETURN_FALSE;
}
Whatta hell...okay, so I didn't test compile with HEAD.
I'm very sowwy..won't happen again for a while. :D
--Jani
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file bug45303.phpt /main/streams plain_wrapper.c
lbarnaudMon Nov 3 16:58:28 2008 UTC
Added files:
/php-src/ext/standard/tests/filebug45303.phpt
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
Fixed bug #45303 (Opening php:// wrapper in append mode results
in a warning)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.96r2=1.97diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.96
php-src/main/streams/plain_wrapper.c:1.97
--- php-src/main/streams/plain_wrapper.c:1.96 Thu Aug 7 09:24:04 2008
+++ php-src/main/streams/plain_wrapper.cMon Nov 3 16:58:27 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.96 2008/08/07 09:24:04 lbarnaud Exp $ */
+/* $Id: plain_wrapper.c,v 1.97 2008/11/03 16:58:27 lbarnaud Exp $ */
#include php.h
#include php_globals.h
@@ -239,6 +239,7 @@
#ifdef ESPIPE
if (stream-position == (off_t)-1 errno == ESPIPE) {
stream-position = 0;
+ stream-flags |= PHP_STREAM_FLAG_NO_SEEK;
self-is_pipe = 1;
}
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug45303.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug45303.phpt
+++ php-src/ext/standard/tests/file/bug45303.phpt
--TEST--
Bug #45303 (Opening php:// wrapper in append mode results in a warning)
--FILE--
?php
$fd = fopen(php://stdout,a);
var_dump($fd);
var_dump(fseek($fd, 1024*1024, SEEK_SET));
?
--EXPECTF--
resource(%d) of type (stream)
Warning: fseek(): stream does not support seeking in %s
int(-1)
--
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/standard/tests/file bug45303.phpt /main/streams plain_wrapper.c
lbarnaudMon Nov 3 16:59:18 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filebug45303.phpt
Modified files:
/php-src/main/streams plain_wrapper.c
/php-srcNEWS
Log:
MFH: Fixed bug #45303 (Opening php:// wrapper in append mode results
in a warning)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.27r2=1.52.2.6.2.28diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.27
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.28
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.27 Mon Dec 31 07:20:15 2007
+++ php-src/main/streams/plain_wrapper.cMon Nov 3 16:59:18 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.27 2007/12/31 07:20:15 sebastian Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.28 2008/11/03 16:59:18 lbarnaud Exp $ */
#include php.h
#include php_globals.h
@@ -242,6 +242,7 @@
#ifdef ESPIPE
if (stream-position == (off_t)-1 errno == ESPIPE) {
stream-position = 0;
+ stream-flags |= PHP_STREAM_FLAG_NO_SEEK;
self-is_pipe = 1;
}
#endif
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1296r2=1.2027.2.547.2.1297diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1296 php-src/NEWS:1.2027.2.547.2.1297
--- php-src/NEWS:1.2027.2.547.2.1296Mon Nov 3 16:08:07 2008
+++ php-src/NEWSMon Nov 3 16:59:18 2008
@@ -21,6 +21,8 @@
dynamicly created property). (Felipe)
- Fixed bug #45529 (new DateTimeZone() and date_create()-getTimezone() behave
different). (Derick)
+- Fixed bug #45303 (Opening php:// wrapper in append mode results in a
warning).
+ (Arnaud)
- Fixed bug #44938 (gettext functions crash with overly long domain).
(Christian Schneider, Ilia)
- Fixed bug #44327 (PDORow::queryString property numeric offsets / Crash).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug45303.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug45303.phpt
+++ php-src/ext/standard/tests/file/bug45303.phpt
--TEST--
Bug #45303 (Opening php:// wrapper in append mode results in a warning)
--FILE--
?php
$fd = fopen(php://stdout,a);
var_dump($fd);
var_dump(fseek($fd, 1024*1024, SEEK_SET));
?
--EXPECTF--
resource(%d) of type (stream)
Warning: fseek(): stream does not support seeking in %s
int(-1)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c /ext/ctype ctype.c /ext/curl interface.c /ext/dat
Em Seg, 2008-11-03 às 14:39 +0200, Jani Taskinen escreveu: Felipe Pena wrote: felipe Sun Nov 2 21:19:41 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/pcre/tests skip.ini skip_001.inc skip_002.inc skip_003.inc Modified files: /php-srcrun-tests.php What does this run-tests.php change do here? Looks like you made the file out-of-sync now with HEAD and PHP_5_2.. Arghhh, reverted... Thanks ;-) -- Regards, Felipe Pena -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c
felipe Mon Nov 3 17:24:12 2008 UTC
Modified files:
/php-src/ext/pgsql pgsql.c
Log:
- Fixed compiler warning
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.392r2=1.393diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.392 php-src/ext/pgsql/pgsql.c:1.393
--- php-src/ext/pgsql/pgsql.c:1.392 Sun Nov 2 21:10:10 2008
+++ php-src/ext/pgsql/pgsql.c Mon Nov 3 17:24:12 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.392 2008/11/02 21:10:10 felipe Exp $ */
+/* $Id: pgsql.c,v 1.393 2008/11/03 17:24:12 felipe Exp $ */
#include stdlib.h
@@ -3393,7 +3393,7 @@
int id = -1, name_len;
int argc = ZEND_NUM_ARGS();
PGconn *pgsql;
- Oid wanted_oid, returned_oid;
+ Oid returned_oid;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC,
rs|z,
pgsql_link, file_in, name_len, oid) == SUCCESS) {
@@ -3427,6 +3427,7 @@
#ifndef HAVE_PG_LO_IMPORT_WITH_OID
php_error_docref(NULL TSRMLS_CC, E_NOTICE, OID value passing
not supported);
#else
+ Oid wanted_oid;
switch (Z_TYPE_P(oid)) {
case IS_STRING:
{
--
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/standard dns.c
felipe Mon Nov 3 11:39:34 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard dns.c
/php-srcNEWS
Log:
- MFH: Fixed bug #42855 (dns_get_record() doesn't return all text from TXT
record)
patch by: a dot u dot savchuk at gmail dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.6r2=1.70.2.7.2.7diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.6
php-src/ext/standard/dns.c:1.70.2.7.2.7
--- php-src/ext/standard/dns.c:1.70.2.7.2.6 Mon Dec 31 07:20:12 2007
+++ php-src/ext/standard/dns.c Mon Nov 3 11:39:34 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.6 2007/12/31 07:20:12 sebastian Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.7 2008/11/03 11:39:34 felipe Exp $ */
/* {{{ includes */
#include php.h
@@ -472,14 +472,23 @@
add_assoc_stringl(*subarray, os, cp, n, 1);
cp += n;
break;
- case DNS_T_TXT:
- add_assoc_string(*subarray, type, TXT, 1);
- n = cp[0];
- tp = emalloc(n + 1);
- memcpy(tp, cp + 1, n);
- tp[n] = '\0';
- cp += dlen;
- add_assoc_stringl(*subarray, txt, tp, n, 0);
+ case DNS_T_TXT:
+ {
+ int ll = 0;
+
+ add_assoc_string(*subarray, type, TXT, 1);
+ tp = emalloc(dlen + 1);
+
+ while (ll dlen) {
+ n = cp[ll];
+ memcpy(tp + ll , cp + ll + 1, n);
+ ll = ll + n + 1;
+ }
+ tp[dlen] = '\0';
+ cp += dlen;
+
+ add_assoc_stringl(*subarray, txt, tp, dlen,
0);
+ }
break;
case DNS_T_SOA:
add_assoc_string(*subarray, type, SOA, 1);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1292r2=1.2027.2.547.2.1293diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1292 php-src/NEWS:1.2027.2.547.2.1293
--- php-src/NEWS:1.2027.2.547.2.1292Sun Nov 2 22:04:40 2008
+++ php-src/NEWSMon Nov 3 11:39:34 2008
@@ -26,6 +26,8 @@
- Fixed bug #43452 (strings containing a weekday, or a number plus weekday
behaved incorrect of the current day-of-week was the same as the one in the
phrase).(Derick)
+- Fixed bug #42855 (dns_get_record() doesn't return all text from TXT record).
+ (a dot u dot savchuk at gmail dot com)
- Fixed bug #42718 (FILTER_UNSAFE_RAW not applied when configured as default
filter). (Arnaud)
- Fixed bug #42294 (Unified solution for round() based on C99 round). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_3) / NEWS /ext/standard/tests/general_functions parse_ini_file.phpt ZendEngine2 zend_ini_scanner.l
Not sure if I agree with this change, it has never meant to work and
doesn't work with any of the ini parsers in other languages.
If anything I would make it an E_NOTICE.
Scott
Arnaud Le Blanc wrote:
lbarnaud Sun Nov 2 23:36:10 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/ZendEngine2 zend_ini_scanner.l
/php-src/ext/standard/tests/general_functions parse_ini_file.phpt
Log:
Fixed bug #44575 (parse_ini_file comment # line problems)
[DOC] parse_ini_file(): comments starting with # are deprecated in PHP 5.3
(comments starting with ; should be used instead)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.358r2=1.2027.2.547.2.965.2.359diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.358
php-src/NEWS:1.2027.2.547.2.965.2.359
--- php-src/NEWS:1.2027.2.547.2.965.2.358 Sun Nov 2 23:06:27 2008
+++ php-src/NEWS Sun Nov 2 23:36:10 2008
@@ -59,6 +59,7 @@
- Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit). (Ilia)
- Fixed bug #45382 (timeout bug in stream_socket_enable_crypto).
(vnegrier at optilian dot com, Ilia)
+- Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud)
- Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes,
chx1975 at gmail dot com)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.l?r1=1.41.2.2.2.2.2.11r2=1.41.2.2.2.2.2.12diff_format=u
Index: ZendEngine2/zend_ini_scanner.l
diff -u ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.11
ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.12
--- ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.11 Thu Sep 11 00:33:38 2008
+++ ZendEngine2/zend_ini_scanner.lSun Nov 2 23:36:10 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.11 2008/09/11 00:33:38 stas Exp
$ */
+/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.12 2008/11/02 23:36:10 lbarnaud
Exp $ */
#include errno.h
#include zend.h
@@ -480,6 +480,13 @@
return END_OF_LINE;
}
+INITIAL{TABS_AND_SPACES}*[#][^\r\n]*{NEWLINE} { /* #Comment */
+ zend_error(E_DEPRECATED, Comments starting with '#' are deprecated in
%s on line %d, ini_filename, SCNG(lineno));
+ BEGIN(INITIAL);
+ SCNG(lineno)++;
+ return END_OF_LINE;
+}
+
ST_VALUE,ST_RAW[^] { /* End of option value (if EOF is reached before EOL
*/
BEGIN(INITIAL);
return END_OF_LINE;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_file.phpt?r1=1.1.2.2.2.5r2=1.1.2.2.2.6diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_file.phpt
diff -u
php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.5
php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.6
---
php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.5
Sun Aug 31 00:19:50 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_file.phpt Sun Nov
2 23:36:10 2008
@@ -105,6 +105,18 @@
file_put_contents($filename, $ini);
var_dump(parse_ini_file($filename, true));
+/* #44575, comments starting with '#' */
+$ini = 'INI'
+foo=bar1
+; comment
+_foo=bar2
+# comment
+foo_=bar3
+INI;
+file_put_contents($filename, $ini);
+var_dump(parse_ini_file($filename, true));
+
+
@unlink($filename);
echo Done\n;
?
@@ -193,4 +205,14 @@
[foo_]=
string(4) bar3
}
+
+Deprecated: Comments starting with '#' are deprecated in %s
+array(3) {
+ [foo]=
+ string(4) bar1
+ [_foo]=
+ string(4) bar2
+ [foo_]=
+ string(4) bar3
+}
Done
--
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/standard/tests/file bug45303.phpt /main/streams plain_wrapper.c
lbarnaudMon Nov 3 16:58:53 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filebug45303.phpt
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
MFH: Fixed bug #45303 (Opening php:// wrapper in append mode results
in a warning)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.23.2.8r2=1.52.2.6.2.23.2.9diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.8
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.9
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.8 Thu Aug 7
09:25:33 2008
+++ php-src/main/streams/plain_wrapper.cMon Nov 3 16:58:53 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.23.2.8 2008/08/07 09:25:33 lbarnaud Exp $
*/
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.23.2.9 2008/11/03 16:58:53 lbarnaud Exp $
*/
#include php.h
#include php_globals.h
@@ -242,6 +242,7 @@
#ifdef ESPIPE
if (stream-position == (off_t)-1 errno == ESPIPE) {
stream-position = 0;
+ stream-flags |= PHP_STREAM_FLAG_NO_SEEK;
self-is_pipe = 1;
}
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug45303.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug45303.phpt
+++ php-src/ext/standard/tests/file/bug45303.phpt
--TEST--
Bug #45303 (Opening php:// wrapper in append mode results in a warning)
--FILE--
?php
$fd = fopen(php://stdout,a);
var_dump($fd);
var_dump(fseek($fd, 1024*1024, SEEK_SET));
?
--EXPECTF--
resource(%d) of type (stream)
Warning: fseek(): stream does not support seeking in %s
int(-1)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd config-win.h
andrey Mon Nov 3 18:07:41 2008 UTC
Modified files:
/php-src/ext/mysqlndconfig-win.h
Log:
Fix the windows build
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.1
php-src/ext/mysqlnd/config-win.h:1.2
--- php-src/ext/mysqlnd/config-win.h:1.1Wed Jul 25 23:47:32 2007
+++ php-src/ext/mysqlnd/config-win.hMon Nov 3 18:07:40 2008
@@ -39,10 +39,12 @@
/* Type information */
+/*
typedef unsigned short ushort;
typedef unsigned intuint;
-typedef unsigned __int64 ulonglong;/* Microsofts 64 bit types */
+typedef unsigned __int64 ulonglong;
typedef __int64longlong;
+*/
typedef int sigset_t;
#define longlong_defined
@@ -54,45 +56,45 @@
#ifndef _WIN64
/* Optimized store functions for Intel x86 */
-#define sint2korr(A) (*((int16 *) (A)))
-#define sint3korr(A) ((int32) uchar) (A)[2]) 128) ? \
- (((uint32) 255L 24) | \
- (((uint32) (uchar) (A)[2]) 16) |\
- (((uint32) (uchar) (A)[1]) 8) | \
- ((uint32) (uchar) (A)[0])) : \
- (((uint32) (uchar) (A)[2]) 16) |\
- (((uint32) (uchar) (A)[1]) 8) | \
- ((uint32) (uchar) (A)[0])))
-#define sint4korr(A) (*((long *) (A)))
-#define uint2korr(A) (*((uint16 *) (A)))
-#define uint3korr(A) (long) (*((unsigned long *) (A)) 0xFF)
-#define uint4korr(A) (*((unsigned long *) (A)))
-#define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\
- (((uint32) ((uchar) (A)[1])) 8) +\
- (((uint32) ((uchar) (A)[2])) 16) +\
- (((uint32) ((uchar) (A)[3])) 24)) +\
- (((ulonglong) ((uchar) (A)[4])) 32))
-#define uint8korr(A) (*((ulonglong *) (A)))
-#define sint8korr(A) (*((longlong *) (A)))
-#define int2store(T,A) *((uint16*) (T))= (uint16) (A)
+#define sint2korr(A) (*((int16_t *) (A)))
+#define sint3korr(A) ((int32_t) uchar) (A)[2]) 128) ? \
+ (((uint32_t) 255L 24) | \
+ (((uint32_t) (uchar) (A)[2]) 16) |\
+ (((uint32_t) (uchar) (A)[1]) 8) | \
+ ((uint32_t) (uchar) (A)[0])) : \
+ (((uint32_t) (uchar) (A)[2]) 16) |\
+ (((uint32_t) (uchar) (A)[1]) 8) | \
+ ((uint32_t) (uchar) (A)[0])))
+#define sint4korr(A) (*((int32_t *) (A)))
+#define uint2korr(A) (*((uint16_t *) (A)))
+#define uint3korr(A) (int32_t) (*((uint32_t *) (A)) 0xFF)
+#define uint4korr(A) (*((uint32_t *) (A)))
+#define uint5korr(A) ((uint64_t)(((uint32_t) ((uchar) (A)[0])) +\
+ (((uint32_t) ((uchar) (A)[1])) 8) +\
+ (((uint32_t) ((uchar) (A)[2])) 16) +\
+ (((uint32_t) ((uchar) (A)[3])) 24)) +\
+ (((uint64_t) ((uchar) (A)[4])) 32))
+#define uint8korr(A) (*((uint64_t *) (A)))
+#define sint8korr(A) (*((int64_t *) (A)))
+#define int2store(T,A) *((uint16_t*) (T))= (uint16_t) (A)
#define int3store(T,A) { *(T)= (uchar) ((A));\
- *(T+1)=(uchar) (((uint) (A) 8));\
+ *(T+1)=(uchar) (((uint32_t) (A) 8));\
*(T+2)=(uchar) (((A) 16)); }
-#define int4store(T,A) *((long *) (T))= (long) (A)
+#define int4store(T,A) *((int32_t *) (T))= (int32_t) (A)
#define int5store(T,A) { *(T)= (uchar)((A));\
*((T)+1)=(uchar) (((A) 8));\
*((T)+2)=(uchar) (((A) 16));\
*((T)+3)=(uchar) (((A) 24)); \
*((T)+4)=(uchar) (((A) 32)); }
-#define int8store(T,A) *((ulonglong *) (T))= (ulonglong) (A)
+#define int8store(T,A) *((uint64_t *) (T))= (uint64_t) (A)
-#define doubleget(V,M) { *((long *) V) = *((long*) M); \
- *(((long *) V)+1) = *(((long*) M)+1); }
-#define doublestore(T,V) { *((long *) T) = *((long*) V); \
- *(((long *) T)+1) = *(((long*) V)+1); }
-#define float4get(V,M) { *((long *) (V)) = *((long*) (M)); }
+#define doubleget(V,M) { *((int32_t *) V) = *((int32_t*) M); \
+ *(((int32_t *) V)+1) = *(((int32_t*) M)+1); }
+#define doublestore(T,V) { *((int32_t *) T) = *((int32_t*) V); \
+ *(((int32_t *) T)+1) = *(((int32_t*) V)+1); }
+#define float4get(V,M) { *((int32_t *) (V)) = *((int32_t*) (M)); }
#define float8get(V,M) doubleget((V),(M))
-#define
[PHP-CVS] cvs: php-src /win32/build template.rc
auroraeosrose Mon Nov 3 19:24:47 2008 UTC Modified files: /php-src/win32/buildtemplate.rc Log: Actual name of the file is WinResRc.h - silly to make people rename their header files http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.rc?r1=1.11r2=1.12diff_format=u Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.11 php-src/win32/build/template.rc:1.12 --- php-src/win32/build/template.rc:1.11Wed May 14 11:18:08 2008 +++ php-src/win32/build/template.rc Mon Nov 3 19:24:47 2008 @@ -1,11 +1,11 @@ /* This is a template RC file. - * $Id: template.rc,v 1.11 2008/05/14 11:18:08 mattwil Exp $ + * $Id: template.rc,v 1.12 2008/11/03 19:24:47 auroraeosrose Exp $ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC #endif -#include winres.h +#include winresrc.h #include main/php_version.h LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -- 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) /win32/build template.rc
auroraeosrose Mon Nov 3 19:25:42 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/buildtemplate.rc Log: MFH http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.rc?r1=1.7.2.2.2.1.2.1r2=1.7.2.2.2.1.2.2diff_format=u Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.7.2.2.2.1.2.1 php-src/win32/build/template.rc:1.7.2.2.2.1.2.2 --- php-src/win32/build/template.rc:1.7.2.2.2.1.2.1 Sat Mar 22 09:07:59 2008 +++ php-src/win32/build/template.rc Mon Nov 3 19:25:42 2008 @@ -1,11 +1,11 @@ /* This is a template RC file. - * $Id: template.rc,v 1.7.2.2.2.1.2.1 2008/03/22 09:07:59 sfox Exp $ + * $Id: template.rc,v 1.7.2.2.2.1.2.2 2008/11/03 19:25:42 auroraeosrose Exp $ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC #endif -#include winres.h +#include winresrc.h #include main/php_version.h LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -- 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) /win32/build template.rc
auroraeosrose Mon Nov 3 19:28:23 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/win32/buildtemplate.rc Log: MFH http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.rc?r1=1.7.2.2.2.1r2=1.7.2.2.2.2diff_format=u Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.7.2.2.2.1 php-src/win32/build/template.rc:1.7.2.2.2.2 --- php-src/win32/build/template.rc:1.7.2.2.2.1 Mon Jan 1 19:32:09 2007 +++ php-src/win32/build/template.rc Mon Nov 3 19:28:23 2008 @@ -1,11 +1,11 @@ /* This is a template RC file. - * $Id: template.rc,v 1.7.2.2.2.1 2007/01/01 19:32:09 iliaa Exp $ + * $Id: template.rc,v 1.7.2.2.2.2 2008/11/03 19:28:23 auroraeosrose Exp $ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC #endif -#include winres.h +#include winresrc.h #include main/php_version.h LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build template.rc
Hi Elizabeth, I think you'll find that's version-specific. I have both those files, and they do rather different things. Can you test against both VC 6 and 9? - Steph - Original Message - From: Elizabeth Marie Smith [EMAIL PROTECTED] To: php-cvs@lists.php.net Sent: Monday, November 03, 2008 7:24 PM Subject: [PHP-CVS] cvs: php-src /win32/build template.rc auroraeosrose Mon Nov 3 19:24:47 2008 UTC Modified files: /php-src/win32/build template.rc Log: Actual name of the file is WinResRc.h - silly to make people rename their header files http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.rc?r1=1.11r2=1.12diff_format=u Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.11 php-src/win32/build/template.rc:1.12 --- php-src/win32/build/template.rc:1.11 Wed May 14 11:18:08 2008 +++ php-src/win32/build/template.rc Mon Nov 3 19:24:47 2008 @@ -1,11 +1,11 @@ /* This is a template RC file. - * $Id: template.rc,v 1.11 2008/05/14 11:18:08 mattwil Exp $ + * $Id: template.rc,v 1.12 2008/11/03 19:24:47 auroraeosrose Exp $ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC #endif -#include winres.h +#include winresrc.h #include main/php_version.h LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dns.c
felipe Mon Nov 3 11:33:32 2008 UTC
Modified files:
/php-src/ext/standard dns.c
Log:
- Fixed bug #42855 (dns_get_record() doesn't return all text from TXT record)
patch by: misc at e2007 dot cynergi dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.94r2=1.95diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.94 php-src/ext/standard/dns.c:1.95
--- php-src/ext/standard/dns.c:1.94 Thu Aug 21 23:37:40 2008
+++ php-src/ext/standard/dns.c Mon Nov 3 11:33:32 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.94 2008/08/21 23:37:40 pajoye Exp $ */
+/* $Id: dns.c,v 1.95 2008/11/03 11:33:32 felipe Exp $ */
/* {{{ includes */
#include php.h
@@ -446,13 +446,22 @@
cp += n;
break;
case DNS_T_TXT:
- add_ascii_assoc_rt_string(*subarray, type, TXT,
ZSTR_DUPLICATE);
- n = cp[0];
- tp = emalloc(n + 1);
- memcpy(tp, cp + 1, n);
- tp[n] = '\0';
- cp += dlen;
- add_ascii_assoc_rt_stringl(*subarray, txt, (char*)tp,
n, ZSTR_AUTOFREE);
+ {
+ int ll = 0;
+
+ add_ascii_assoc_rt_string(*subarray, type,
TXT, ZSTR_DUPLICATE);
+ tp = emalloc(dlen + 1);
+
+ while (ll dlen) {
+ n = cp[ll];
+ memcpy(tp + ll , cp + ll + 1, n);
+ ll = ll + n + 1;
+ }
+ tp[dlen] = '\0';
+ cp += dlen;
+
+ add_ascii_assoc_rt_stringl(*subarray, txt,
tp, dlen, ZSTR_AUTOFREE);
+ }
break;
case DNS_T_SOA:
add_ascii_assoc_rt_string(*subarray, type, SOA,
ZSTR_DUPLICATE);
--
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_stmt.c /ext/pdo_sqlite/tests debugdumpparams_001.phpt
felipe Mon Nov 3 20:45:43 2008 UTC
Added files:
/php-src/ext/pdo_sqlite/tests debugdumpparams_001.phpt
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
- Fixed endless loop in PDOStatement::debugDumpParams()
patch by: Jonah H. Harris jonah.harris at gmail dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.205r2=1.206diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.205 php-src/ext/pdo/pdo_stmt.c:1.206
--- php-src/ext/pdo/pdo_stmt.c:1.205Mon Nov 3 15:31:51 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 3 20:45:43 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.205 2008/11/03 15:31:51 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.206 2008/11/03 20:45:43 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -2211,6 +2211,7 @@
param-is_param,
param-param_type);
+ zend_hash_move_forward_ex(stmt-bound_params, pos);
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt
+++ php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt
--TEST--
Testing PDOStatement::debugDumpParams() with bound params
--SKIPIF--
?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
?
--FILE--
?php
$db = new pdo('sqlite:memory');
$x= $db-prepare('select :a, :b');
$x-bindValue(':a', 1, PDO::PARAM_INT);
$x-bindValue(':b', 'foo');
var_dump($x-debugDumpParams());
?
--EXPECT--
SQL: [13] select :a, :b
Params: 2
Key: Position #0:
paramno=-1
name=[2] :a
is_param=1
param_type=1
Key: Position #0:
paramno=-1
name=[2] :b
is_param=1
param_type=2
NULL
--
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_stmt.c /ext/pdo_sqlite/tests debugdumpparams_001.phpt
felipe Mon Nov 3 20:48:51 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite/tests debugdumpparams_001.phpt
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
MFH:
- Fixed endless loop in PDOStatement::debugDumpParams()
patch by: Jonah H. Harris jonah.harris at gmail dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.31r2=1.118.2.38.2.24.2.32diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.31
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.32
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.31 Mon Nov 3 15:33:22 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 3 20:48:51 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.31 2008/11/03 15:33:22 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.32 2008/11/03 20:48:51 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -2208,6 +2208,7 @@
param-is_param,
param-param_type);
+ zend_hash_move_forward_ex(stmt-bound_params, pos);
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt
+++ php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt
--TEST--
Testing PDOStatement::debugDumpParams() with bound params
--SKIPIF--
?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
?
--FILE--
?php
$db = new pdo('sqlite:memory');
$x= $db-prepare('select :a, :b');
$x-bindValue(':a', 1, PDO::PARAM_INT);
$x-bindValue(':b', 'foo');
var_dump($x-debugDumpParams());
?
--EXPECT--
SQL: [13] select :a, :b
Params: 2
Key: Position #0:
paramno=-1
name=[2] :a
is_param=1
param_type=1
Key: Position #0:
paramno=-1
name=[2] :b
is_param=1
param_type=2
NULL
--
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 /ext/pdo_sqlite/tests debugdumpparams_001.phpt
felipe Mon Nov 3 20:55:01 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/pdo_sqlite/tests debugdumpparams_001.phpt
Modified files:
/php-src/ext/pdopdo_stmt.c
/php-srcNEWS
Log:
MFH:
- Fixed endless loop in PDOStatement::debugDumpParams()
patch by: Jonah H. Harris jonah.harris at gmail dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.42r2=1.118.2.38.2.43diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.42
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.43
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.42 Mon Nov 3 15:41:35 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 3 20:55:01 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.42 2008/11/03 15:41:35 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.43 2008/11/03 20:55:01 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -2189,6 +2189,7 @@
param-is_param,
param-param_type);
+ zend_hash_move_forward_ex(stmt-bound_params, pos);
}
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1297r2=1.2027.2.547.2.1298diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1297 php-src/NEWS:1.2027.2.547.2.1298
--- php-src/NEWS:1.2027.2.547.2.1297Mon Nov 3 16:59:18 2008
+++ php-src/NEWSMon Nov 3 20:55:01 2008
@@ -38,6 +38,8 @@
filter). (Arnaud)
- Fixed bug #42294 (Unified solution for round() based on C99 round). (Ilia)
+- Fixed endless loop in PDOStatement::debugDumpParams().
+ (jonah.harris at gmail dot com)
- Fixed ability to use internal heaps in extensions. (Arnaud, Dmitry)
- Fixed weekdays adding/subtracting algorithm. (Derick)
- Fixed some ambiguities in the date parser. (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt
+++ php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt
--TEST--
Testing PDOStatement::debugDumpParams() with bound params
--SKIPIF--
?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
?
--FILE--
?php
$db = new pdo('sqlite:memory');
$x= $db-prepare('select :a, :b');
$x-bindValue(':a', 1, PDO::PARAM_INT);
$x-bindValue(':b', 'foo');
var_dump($x-debugDumpParams());
?
--EXPECT--
SQL: [13] select :a, :b
Params: 2
Key: Position #0:
paramno=-1
name=[2] :a
is_param=1
param_type=1
Key: Position #0:
paramno=-1
name=[2] :b
is_param=1
param_type=2
NULL
--
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/tests bug44327_2.phpt
felipe Mon Nov 3 21:49:18 2008 UTC
Added files:
/php-src/ext/pdo_sqlite/tests bug44327_2.phpt
Log:
- New test
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug44327_2.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug44327_2.phpt
+++ php-src/ext/pdo_sqlite/tests/bug44327_2.phpt
--TEST--
Bug #44327.2 (PDORow::queryString property numeric offsets / Crash)
--SKIPIF--
?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
?
--FILE--
?php
$db = new pdo('sqlite:memory');
$x = $db-query('select 1 as queryString');
var_dump($x, $x-queryString);
$y = $x-fetch();
var_dump($y, @$y-queryString);
print \n;
$x = $db-query('select 1 as queryString');
var_dump($x, $x-queryString);
$y = $x-fetch(PDO::FETCH_LAZY);
var_dump($y, $y-queryString);
?
--EXPECTF--
object(PDOStatement)#%d (1) {
[queryString]=
string(23) select 1 as queryString
}
string(23) select 1 as queryString
array(2) {
[queryString]=
string(1) 1
[0]=
string(1) 1
}
NULL
object(PDOStatement)#%d (1) {
[queryString]=
string(23) select 1 as queryString
}
string(23) select 1 as queryString
object(PDORow)#%d (1) {
[queryString]=
string(1) 1
}
string(1) 1
--
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_sqlite/tests bug44327_2.phpt
felipe Mon Nov 3 21:49:34 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite/tests bug44327_2.phpt
Log:
- New test
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug44327_2.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug44327_2.phpt
+++ php-src/ext/pdo_sqlite/tests/bug44327_2.phpt
--TEST--
Bug #44327.2 (PDORow::queryString property numeric offsets / Crash)
--SKIPIF--
?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
?
--FILE--
?php
$db = new pdo('sqlite:memory');
$x = $db-query('select 1 as queryString');
var_dump($x, $x-queryString);
$y = $x-fetch();
var_dump($y, @$y-queryString);
print \n;
$x = $db-query('select 1 as queryString');
var_dump($x, $x-queryString);
$y = $x-fetch(PDO::FETCH_LAZY);
var_dump($y, $y-queryString);
?
--EXPECTF--
object(PDOStatement)#%d (1) {
[queryString]=
string(23) select 1 as queryString
}
string(23) select 1 as queryString
array(2) {
[queryString]=
string(1) 1
[0]=
string(1) 1
}
NULL
object(PDOStatement)#%d (1) {
[queryString]=
string(23) select 1 as queryString
}
string(23) select 1 as queryString
object(PDORow)#%d (1) {
[queryString]=
string(1) 1
}
string(1) 1
--
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_sqlite/tests bug44327_2.phpt
felipe Mon Nov 3 21:49:49 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/pdo_sqlite/tests bug44327_2.phpt
Log:
- New test
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug44327_2.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug44327_2.phpt
+++ php-src/ext/pdo_sqlite/tests/bug44327_2.phpt
--TEST--
Bug #44327.2 (PDORow::queryString property numeric offsets / Crash)
--SKIPIF--
?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
?
--FILE--
?php
$db = new pdo('sqlite:memory');
$x = $db-query('select 1 as queryString');
var_dump($x, $x-queryString);
$y = $x-fetch();
var_dump($y, @$y-queryString);
print \n;
$x = $db-query('select 1 as queryString');
var_dump($x, $x-queryString);
$y = $x-fetch(PDO::FETCH_LAZY);
var_dump($y, $y-queryString);
?
--EXPECTF--
object(PDOStatement)#%d (1) {
[queryString]=
string(23) select 1 as queryString
}
string(23) select 1 as queryString
array(2) {
[queryString]=
string(1) 1
[0]=
string(1) 1
}
NULL
object(PDOStatement)#%d (1) {
[queryString]=
string(23) select 1 as queryString
}
string(23) select 1 as queryString
object(PDORow)#%d (1) {
[queryString]=
string(1) 1
}
string(1) 1
--
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/tests bug44327_2.phpt
felipe Mon Nov 3 22:22:25 2008 UTC
Modified files:
/php-src/ext/pdo_sqlite/tests bug44327_2.phpt
Log:
- Fix test (string - unicode)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug44327_2.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo_sqlite/tests/bug44327_2.phpt
diff -u php-src/ext/pdo_sqlite/tests/bug44327_2.phpt:1.1
php-src/ext/pdo_sqlite/tests/bug44327_2.phpt:1.2
--- php-src/ext/pdo_sqlite/tests/bug44327_2.phpt:1.1Mon Nov 3 21:49:18 2008
+++ php-src/ext/pdo_sqlite/tests/bug44327_2.phptMon Nov 3 22:22:25 2008
@@ -26,25 +26,25 @@
?
--EXPECTF--
object(PDOStatement)#%d (1) {
- [queryString]=
- string(23) select 1 as queryString
+ [uqueryString]=
+ unicode(23) select 1 as queryString
}
-string(23) select 1 as queryString
+unicode(23) select 1 as queryString
array(2) {
- [queryString]=
- string(1) 1
+ [uqueryString]=
+ unicode(1) 1
[0]=
- string(1) 1
+ unicode(1) 1
}
NULL
object(PDOStatement)#%d (1) {
- [queryString]=
- string(23) select 1 as queryString
+ [uqueryString]=
+ unicode(23) select 1 as queryString
}
-string(23) select 1 as queryString
+unicode(23) select 1 as queryString
object(PDORow)#%d (1) {
- [queryString]=
- string(1) 1
+ [uqueryString]=
+ unicode(1) 1
}
-string(1) 1
+unicode(1) 1
--
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 /sapi/cgi cgi_main.c /sapi/cli php_cli.c
lbarnaudMon Nov 3 23:26:24 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cli php_cli.c
Log:
Fixed bug #46379 (Infinite loop when parsing '#' in one line file)
# PHP_5_2 only
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1298r2=1.2027.2.547.2.1299diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1298 php-src/NEWS:1.2027.2.547.2.1299
--- php-src/NEWS:1.2027.2.547.2.1298Mon Nov 3 20:55:01 2008
+++ php-src/NEWSMon Nov 3 23:26:23 2008
@@ -11,6 +11,7 @@
- Fixed bug #46406 (Unregistering nodeclass throws E_FATAL). (Rob)
- Fixed bug #46389 (NetWare needs small patch for _timezone).
(patch by [EMAIL PROTECTED])
+- Fixed bug #46379 (Infinite loop when parsing '#' in one line file). (Arnaud)
- Fixed bug #46388 (stream_notification_callback inside of object destroys
object variables). (Felipe)
- Fixed bug #46381 (wrong $this passed to internal methods causes segfault).
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.63r2=1.267.2.15.2.64diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.63
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.64
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.63 Tue Oct 21 16:43:59 2008
+++ php-src/sapi/cgi/cgi_main.c Mon Nov 3 23:26:23 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.63 2008/10/21 16:43:59 lbarnaud Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.64 2008/11/03 23:26:23 lbarnaud Exp $ */
#include php.h
#include php_globals.h
@@ -1964,7 +1964,7 @@
/* #!php support */
c = fgetc(file_handle.handle.fp);
if (c == '#') {
- while (c != '\n' c != '\r') {
+ while (c != '\n' c != '\r' c != EOF) {
c = fgetc(file_handle.handle.fp);
/* skip to end of line */
}
/* handle situations where line is terminated
by \r\n */
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.27r2=1.129.2.13.2.28diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.27
php-src/sapi/cli/php_cli.c:1.129.2.13.2.28
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.27 Wed Aug 13 01:01:29 2008
+++ php-src/sapi/cli/php_cli.c Mon Nov 3 23:26:24 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.129.2.13.2.27 2008/08/13 01:01:29 jani Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.28 2008/11/03 23:26:24 lbarnaud Exp $ */
#include php.h
#include php_globals.h
@@ -562,7 +562,7 @@
/* #!php support */
c = fgetc(file_handle-handle.fp);
if (c == '#') {
- while (c != '\n' c != '\r') {
+ while (c != '\n' c != '\r' c != EOF) {
c = fgetc(file_handle-handle.fp); /* skip to end
of line */
}
/* handle situations where line is terminated by \r\n */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file bug44607.phpt /main/streams streams.c
lbarnaudMon Nov 3 23:28:45 2008 UTC
Added files:
/php-src/ext/standard/tests/filebug44607.phpt
Modified files:
/php-src/main/streams streams.c
Log:
Fixed bug #44607 (stream_get_line unable to correctly identify the
ending in the stream content)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.171r2=1.172diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.171
php-src/main/streams/streams.c:1.172
--- php-src/main/streams/streams.c:1.171Mon Nov 3 15:47:05 2008
+++ php-src/main/streams/streams.c Mon Nov 3 23:28:45 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.171 2008/11/03 15:47:05 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.172 2008/11/03 23:28:45 lbarnaud Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -551,16 +551,16 @@
efree(chunk_buf);
} else {/* Unfiltered Binary stream */
+ /* reduce buffer memory consumption if possible, to avoid a
realloc */
+ if (stream-readbuf.s stream-readbuflen - stream-writepos
stream-chunk_size) {
+ memmove(stream-readbuf.s, stream-readbuf.s +
stream-readpos, stream-writepos - stream-readpos);
+ stream-writepos -= stream-readpos;
+ stream-readpos = 0;
+ }
/* is there enough data in the buffer ? */
- if (stream-writepos - stream-readpos (off_t)size) {
+ while (stream-writepos - stream-readpos (off_t)size) {
size_t justread = 0;
-
- /* reduce buffer memory consumption if possible, to
avoid a realloc */
- if (stream-readbuf.s stream-readbuflen -
stream-writepos stream-chunk_size) {
- memmove(stream-readbuf.s, stream-readbuf.s +
stream-readpos, stream-writepos - stream-readpos);
- stream-writepos -= stream-readpos;
- stream-readpos = 0;
- }
+ size_t toread;
/* grow the buffer if required
* TODO: this can fail for persistent streams */
@@ -569,10 +569,15 @@
stream-readbuf.s =
(char*)perealloc(stream-readbuf.s, stream-readbuflen, stream-is_persistent);
}
- justread = stream-ops-read(stream, stream-readbuf.s
+ stream-writepos, stream-readbuflen - stream-writepos TSRMLS_CC);
- if (justread != (size_t)-1 justread != 0) {
+ toread = stream-readbuflen - stream-writepos;
+ justread = stream-ops-read(stream, stream-readbuf.s
+ stream-writepos, toread TSRMLS_CC);
+
+ if (justread != (size_t)-1) {
stream-writepos += justread;
}
+ if (stream-eof || justread != toread) {
+ break;
+ }
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug44607.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug44607.phpt
+++ php-src/ext/standard/tests/file/bug44607.phpt
--TEST--
Bug #44607 (stream_get_line unable to correctly identify the ending in the
stream content)
--FILE--
?php
$eol = 'EOL';
$tempnam = tempnam(sys_get_temp_dir(), 'php');
$data = str_repeat('.', 14000);
$data .= $eol;
$data .= $data;
file_put_contents($tempnam, $data);
$fd = fopen($tempnam, 'r');
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
fseek($fd, 1, SEEK_SET);
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
?
--EXPECT--
int(14000)
int(14000)
int(13999)
int(14000)
--
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/standard/tests/file bug44607.phpt /main/streams streams.c
lbarnaudMon Nov 3 23:29:17 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filebug44607.phpt
Modified files:
/php-src/main/streams streams.c
Log:
MFH: Fixed bug #44607 (stream_get_line unable to correctly identify the
ending in the stream content)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.16r2=1.82.2.6.2.18.2.17diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.16
php-src/main/streams/streams.c:1.82.2.6.2.18.2.17
--- php-src/main/streams/streams.c:1.82.2.6.2.18.2.16 Mon Nov 3 15:47:31 2008
+++ php-src/main/streams/streams.c Mon Nov 3 23:29:17 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.18.2.16 2008/11/03 15:47:31 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18.2.17 2008/11/03 23:29:17 lbarnaud Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -540,16 +540,16 @@
efree(chunk_buf);
} else {
+ /* reduce buffer memory consumption if possible, to avoid a
realloc */
+ if (stream-readbuf stream-readbuflen - stream-writepos
stream-chunk_size) {
+ memmove(stream-readbuf, stream-readbuf +
stream-readpos, stream-readbuflen - stream-readpos);
+ stream-writepos -= stream-readpos;
+ stream-readpos = 0;
+ }
/* is there enough data in the buffer ? */
- if (stream-writepos - stream-readpos (off_t)size) {
+ while (stream-writepos - stream-readpos (off_t)size) {
size_t justread = 0;
-
- /* reduce buffer memory consumption if possible, to
avoid a realloc */
- if (stream-readbuf stream-readbuflen -
stream-writepos stream-chunk_size) {
- memmove(stream-readbuf, stream-readbuf +
stream-readpos, stream-readbuflen - stream-readpos);
- stream-writepos -= stream-readpos;
- stream-readpos = 0;
- }
+ size_t toread;
/* grow the buffer if required
* TODO: this can fail for persistent streams */
@@ -559,13 +559,17 @@
stream-is_persistent);
}
+ toread = stream-readbuflen - stream-writepos;
justread = stream-ops-read(stream, stream-readbuf +
stream-writepos,
- stream-readbuflen - stream-writepos
+ toread
TSRMLS_CC);
if (justread != (size_t)-1) {
stream-writepos += justread;
}
+ if (stream-eof || justread != toread) {
+ break;
+ }
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug44607.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug44607.phpt
+++ php-src/ext/standard/tests/file/bug44607.phpt
--TEST--
Bug #44607 (stream_get_line unable to correctly identify the ending in the
stream content)
--FILE--
?php
$eol = 'EOL';
$tempnam = tempnam(sys_get_temp_dir(), 'php');
$data = str_repeat('.', 14000);
$data .= $eol;
$data .= $data;
file_put_contents($tempnam, $data);
$fd = fopen($tempnam, 'r');
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
fseek($fd, 1, SEEK_SET);
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
?
--EXPECT--
int(14000)
int(14000)
int(13999)
int(14000)
--
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/standard/tests/file bug44607.phpt /main/streams streams.c
lbarnaudMon Nov 3 23:29:50 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filebug44607.phpt
Modified files:
/php-src/main/streams streams.c
/php-srcNEWS
Log:
MFH: Fixed bug #44607 (stream_get_line unable to correctly identify the
ending in the stream content)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.27r2=1.82.2.6.2.28diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.27
php-src/main/streams/streams.c:1.82.2.6.2.28
--- php-src/main/streams/streams.c:1.82.2.6.2.27Mon Nov 3 15:48:05 2008
+++ php-src/main/streams/streams.c Mon Nov 3 23:29:50 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.27 2008/11/03 15:48:05 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.28 2008/11/03 23:29:50 lbarnaud Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -531,16 +531,16 @@
efree(chunk_buf);
} else {
+ /* reduce buffer memory consumption if possible, to avoid a
realloc */
+ if (stream-readbuf stream-readbuflen - stream-writepos
stream-chunk_size) {
+ memmove(stream-readbuf, stream-readbuf +
stream-readpos, stream-readbuflen - stream-readpos);
+ stream-writepos -= stream-readpos;
+ stream-readpos = 0;
+ }
/* is there enough data in the buffer ? */
- if (stream-writepos - stream-readpos (off_t)size) {
+ while (stream-writepos - stream-readpos (off_t)size) {
size_t justread = 0;
-
- /* reduce buffer memory consumption if possible, to
avoid a realloc */
- if (stream-readbuf stream-readbuflen -
stream-writepos stream-chunk_size) {
- memmove(stream-readbuf, stream-readbuf +
stream-readpos, stream-readbuflen - stream-readpos);
- stream-writepos -= stream-readpos;
- stream-readpos = 0;
- }
+ size_t toread;
/* grow the buffer if required
* TODO: this can fail for persistent streams */
@@ -550,13 +550,17 @@
stream-is_persistent);
}
+ toread = stream-readbuflen - stream-writepos;
justread = stream-ops-read(stream, stream-readbuf +
stream-writepos,
- stream-readbuflen - stream-writepos
+ toread
TSRMLS_CC);
if (justread != (size_t)-1) {
stream-writepos += justread;
}
+ if (stream-eof || justread != toread) {
+ break;
+ }
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1299r2=1.2027.2.547.2.1300diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1299 php-src/NEWS:1.2027.2.547.2.1300
--- php-src/NEWS:1.2027.2.547.2.1299Mon Nov 3 23:26:23 2008
+++ php-src/NEWSMon Nov 3 23:29:50 2008
@@ -26,6 +26,8 @@
(Arnaud)
- Fixed bug #44938 (gettext functions crash with overly long domain).
(Christian Schneider, Ilia)
+- Fixed bug #44607 (stream_get_line unable to correctly identify the ending
+ in the stream content). (Arnaud)
- Fixed bug #44327 (PDORow::queryString property numeric offsets / Crash).
(Felipe)
- Fixed bug #43452 (strings containing a weekday, or a number plus weekday
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug44607.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug44607.phpt
+++ php-src/ext/standard/tests/file/bug44607.phpt
--TEST--
Bug #44607 (stream_get_line unable to correctly identify the ending in the
stream content)
--FILE--
?php
$eol = 'EOL';
$tempnam = tempnam(sys_get_temp_dir(), 'php');
$data = str_repeat('.', 14000);
$data .= $eol;
$data .= $data;
file_put_contents($tempnam, $data);
$fd = fopen($tempnam, 'r');
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
fseek($fd, 1, SEEK_SET);
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
var_dump(strlen(stream_get_line($fd, 15000, $eol)));
?
--EXPECT--
int(14000)
int(14000)
int(13999)
int(14000)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file bug44607.phpt
lbarnaudMon Nov 3 23:34:18 2008 UTC Modified files: /php-src/ext/standard/tests/filebug44607.phpt Log: cleanup http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug44607.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/file/bug44607.phpt diff -u php-src/ext/standard/tests/file/bug44607.phpt:1.1 php-src/ext/standard/tests/file/bug44607.phpt:1.2 --- php-src/ext/standard/tests/file/bug44607.phpt:1.1 Mon Nov 3 23:28:45 2008 +++ php-src/ext/standard/tests/file/bug44607.phpt Mon Nov 3 23:34:17 2008 @@ -14,6 +14,7 @@ fseek($fd, 1, SEEK_SET); var_dump(strlen(stream_get_line($fd, 15000, $eol))); var_dump(strlen(stream_get_line($fd, 15000, $eol))); +unlink($tempnam); ? --EXPECT-- int(14000) -- 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/standard/tests/file bug44607.phpt
lbarnaudMon Nov 3 23:34:26 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filebug44607.phpt Log: cleanup http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug44607.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/file/bug44607.phpt diff -u php-src/ext/standard/tests/file/bug44607.phpt:1.1.2.2 php-src/ext/standard/tests/file/bug44607.phpt:1.1.2.3 --- php-src/ext/standard/tests/file/bug44607.phpt:1.1.2.2 Mon Nov 3 23:29:17 2008 +++ php-src/ext/standard/tests/file/bug44607.phpt Mon Nov 3 23:34:26 2008 @@ -14,6 +14,7 @@ fseek($fd, 1, SEEK_SET); var_dump(strlen(stream_get_line($fd, 15000, $eol))); var_dump(strlen(stream_get_line($fd, 15000, $eol))); +unlink($tempnam); ? --EXPECT-- int(14000) -- 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/standard/tests/file bug44607.phpt
lbarnaudMon Nov 3 23:34:36 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filebug44607.phpt Log: cleanup http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug44607.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/file/bug44607.phpt diff -u php-src/ext/standard/tests/file/bug44607.phpt:1.1.4.2 php-src/ext/standard/tests/file/bug44607.phpt:1.1.4.3 --- php-src/ext/standard/tests/file/bug44607.phpt:1.1.4.2 Mon Nov 3 23:29:50 2008 +++ php-src/ext/standard/tests/file/bug44607.phpt Mon Nov 3 23:34:36 2008 @@ -14,6 +14,7 @@ fseek($fd, 1, SEEK_SET); var_dump(strlen(stream_get_line($fd, 15000, $eol))); var_dump(strlen(stream_get_line($fd, 15000, $eol))); +unlink($tempnam); ? --EXPECT-- int(14000) -- 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_stmt.c /ext/pdo_sqlite/tests bug44327_3.phpt
felipe Mon Nov 3 23:43:51 2008 UTC
Added files:
/php-src/ext/pdo_sqlite/tests bug44327_3.phpt
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
- Improved fix
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.206r2=1.207diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.206 php-src/ext/pdo/pdo_stmt.c:1.207
--- php-src/ext/pdo/pdo_stmt.c:1.206Mon Nov 3 20:45:43 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 3 23:43:51 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.206 2008/11/03 20:45:43 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.207 2008/11/03 23:43:51 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -2623,11 +2623,8 @@
pdo_stmt_t * stmt = (pdo_stmt_t *) zend_object_store_get_object(object
TSRMLS_CC);
int colno = -1;
- if ((Z_TYPE_P(member) == IS_STRING || Z_TYPE_P(member) == IS_UNICODE)
- memcmp(Z_UNIVAL_P(member).v, queryString,
sizeof(queryString)-1)) {
- return std_object_handlers.read_property(object, member,
IS_STRING TSRMLS_CC);
- }
MAKE_STD_ZVAL(return_value);
+ RETVAL_NULL();
if (Z_TYPE_P(member) == IS_LONG) {
if (Z_LVAL_P(member) = 0 Z_LVAL_P(member)
stmt-column_count) {
@@ -2640,9 +2637,14 @@
for (colno = 0; colno stmt-column_count; colno++) {
if (strcmp(stmt-columns[colno].name,
Z_STRVAL_P(member)) == 0) {
fetch_value(stmt, return_value, colno, NULL
TSRMLS_CC);
- break;
+ Z_SET_REFCOUNT_P(return_value, 0);
+ Z_UNSET_ISREF_P(return_value);
+ return return_value;
}
}
+ if (strcmp(Z_STRVAL_P(member), queryString) == 0) {
+ return std_object_handlers.read_property(object,
member, IS_STRING TSRMLS_CC);
+ }
}
Z_SET_REFCOUNT_P(return_value, 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug44327_3.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug44327_3.phpt
+++ php-src/ext/pdo_sqlite/tests/bug44327_3.phpt
--TEST--
Bug #44327.3 (PDORow::queryString property numeric offsets / Crash)
--SKIPIF--
?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
?
--FILE--
?php
$db = new pdo('sqlite:memory');
$x = $db-query('select 1 as queryStringxx');
$y = $x-fetch(PDO::FETCH_LAZY);
var_dump($y, $y-queryString, $y-queryStringzz, $y-queryStringxx);
print ---\n;
var_dump($y[5], $y-{3});
?
--EXPECTF--
object(PDORow)#%d (2) {
[queryString]=
string(25) select 1 as queryStringxx
[queryStringxx]=
string(1) 1
}
string(25) select 1 as queryStringxx
NULL
string(1) 1
---
NULL
NULL
--
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_stmt.c /ext/pdo_sqlite/tests bug44327_3.phpt
felipe Mon Nov 3 23:44:38 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite/tests bug44327_3.phpt
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
- MFH: Improved fix
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.32r2=1.118.2.38.2.24.2.33diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.32
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.33
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.32 Mon Nov 3 20:48:51 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 3 23:44:38 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.32 2008/11/03 20:48:51 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.33 2008/11/03 23:44:38 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -2615,10 +2615,8 @@
pdo_stmt_t * stmt = (pdo_stmt_t *) zend_object_store_get_object(object
TSRMLS_CC);
int colno = -1;
- if (Z_TYPE_P(member) == IS_STRING strcmp(Z_STRVAL_P(member),
queryString) == 0) {
- return std_object_handlers.read_property(object, member,
IS_STRING TSRMLS_CC);
- }
MAKE_STD_ZVAL(return_value);
+ RETVAL_NULL();
if (Z_TYPE_P(member) == IS_LONG) {
if (Z_LVAL_P(member) = 0 Z_LVAL_P(member)
stmt-column_count) {
@@ -2631,9 +2629,15 @@
for (colno = 0; colno stmt-column_count; colno++) {
if (strcmp(stmt-columns[colno].name,
Z_STRVAL_P(member)) == 0) {
fetch_value(stmt, return_value, colno, NULL
TSRMLS_CC);
- break;
+ Z_SET_REFCOUNT_P(return_value, 0);
+ Z_UNSET_ISREF_P(return_value);
+ return return_value;
}
}
+ if (strcmp(Z_STRVAL_P(member), queryString) == 0) {
+ zval_ptr_dtor(return_value);
+ return std_object_handlers.read_property(object,
member, IS_STRING TSRMLS_CC);
+ }
}
Z_SET_REFCOUNT_P(return_value, 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug44327_3.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug44327_3.phpt
+++ php-src/ext/pdo_sqlite/tests/bug44327_3.phpt
--TEST--
Bug #44327.3 (PDORow::queryString property numeric offsets / Crash)
--SKIPIF--
?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
?
--FILE--
?php
$db = new pdo('sqlite:memory');
$x = $db-query('select 1 as queryStringxx');
$y = $x-fetch(PDO::FETCH_LAZY);
var_dump($y, $y-queryString, $y-queryStringzz, $y-queryStringxx);
print ---\n;
var_dump($y[5], $y-{3});
?
--EXPECTF--
object(PDORow)#%d (2) {
[queryString]=
string(25) select 1 as queryStringxx
[queryStringxx]=
string(1) 1
}
string(25) select 1 as queryStringxx
NULL
string(1) 1
---
NULL
NULL
--
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_stmt.c /ext/pdo_sqlite/tests bug44327_3.phpt
felipe Mon Nov 3 23:45:17 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/pdo_sqlite/tests bug44327_3.phpt
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
- MFH: Improved fix
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.43r2=1.118.2.38.2.44diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.43
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.44
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.43 Mon Nov 3 20:55:01 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 3 23:45:17 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.43 2008/11/03 20:55:01 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.44 2008/11/03 23:45:17 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -2596,10 +2596,8 @@
pdo_stmt_t * stmt = (pdo_stmt_t *) zend_object_store_get_object(object
TSRMLS_CC);
int colno = -1;
- if (Z_TYPE_P(member) == IS_STRING strcmp(Z_STRVAL_P(member),
queryString) == 0) {
- return std_object_handlers.read_property(object, member,
IS_STRING TSRMLS_CC);
- }
MAKE_STD_ZVAL(return_value);
+ RETVAL_NULL();
if (Z_TYPE_P(member) == IS_LONG) {
if (Z_LVAL_P(member) = 0 Z_LVAL_P(member)
stmt-column_count) {
@@ -2612,9 +2610,15 @@
for (colno = 0; colno stmt-column_count; colno++) {
if (strcmp(stmt-columns[colno].name,
Z_STRVAL_P(member)) == 0) {
fetch_value(stmt, return_value, colno, NULL
TSRMLS_CC);
- break;
+ return_value-refcount = 0;
+ return_value-is_ref = 0;
+ return return_value;
}
}
+ if (strcmp(Z_STRVAL_P(member), queryString) == 0) {
+ zval_ptr_dtor(return_value);
+ return std_object_handlers.read_property(object,
member, IS_STRING TSRMLS_CC);
+ }
}
return_value-refcount = 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug44327_3.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug44327_3.phpt
+++ php-src/ext/pdo_sqlite/tests/bug44327_3.phpt
--TEST--
Bug #44327.3 (PDORow::queryString property numeric offsets / Crash)
--SKIPIF--
?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
?
--FILE--
?php
$db = new pdo('sqlite:memory');
$x = $db-query('select 1 as queryStringxx');
$y = $x-fetch(PDO::FETCH_LAZY);
var_dump($y, $y-queryString, $y-queryStringzz, $y-queryStringxx);
print ---\n;
var_dump($y[5], $y-{3});
?
--EXPECTF--
object(PDORow)#%d (2) {
[queryString]=
string(25) select 1 as queryStringxx
[queryStringxx]=
string(1) 1
}
string(25) select 1 as queryStringxx
NULL
string(1) 1
---
NULL
NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli/tests 001.phpt
helly Tue Nov 4 00:34:24 2008 UTC
Modified files:
/php-src/sapi/cli/tests 001.phpt
Log:
- Cleanup
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/001.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/sapi/cli/tests/001.phpt
diff -u php-src/sapi/cli/tests/001.phpt:1.2 php-src/sapi/cli/tests/001.phpt:1.3
--- php-src/sapi/cli/tests/001.phpt:1.2 Sat Jan 20 22:12:45 2007
+++ php-src/sapi/cli/tests/001.phpt Tue Nov 4 00:34:24 2008
@@ -7,7 +7,7 @@
$php = getenv('TEST_PHP_EXECUTABLE');
-var_dump(`$php -n -v`);
+var_dump(`$php -n -v`);
echo Done\n;
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c /ext/standard/tests/streams bug46024.phpt
lbarnaudTue Nov 4 00:42:19 2008 UTC
Added files:
/php-src/ext/standard/tests/streams bug46024.phpt
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
Fixed bug #46024 (stream_select() doesn't return the correct number)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.127r2=1.128diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.127
php-src/ext/standard/streamsfuncs.c:1.128
--- php-src/ext/standard/streamsfuncs.c:1.127 Thu Oct 30 14:30:02 2008
+++ php-src/ext/standard/streamsfuncs.c Tue Nov 4 00:42:19 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.127 2008/10/30 14:30:02 felipe Exp $ */
+/* $Id: streamsfuncs.c,v 1.128 2008/11/04 00:42:19 lbarnaud Exp $ */
#include php.h
#include php_globals.h
@@ -836,6 +836,12 @@
retval = stream_array_emulate_read_fd_set(r_array TSRMLS_CC);
if (retval 0) {
+ if (w_array != NULL) {
+ zend_hash_clean(Z_ARRVAL_P(w_array));
+ }
+ if (e_array != NULL) {
+ zend_hash_clean(Z_ARRVAL_P(e_array));
+ }
RETURN_LONG(retval);
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/bug46024.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/bug46024.phpt
+++ php-src/ext/standard/tests/streams/bug46024.phpt
--TEST--
Bug #46024 stream_select() doesn't return the correct number
--SKIPIF--
?php if (!getenv('TEST_PHP_EXECUTABLE')) die(TEST_PHP_EXECUTABLE not
defined); ?
--FILE--
?php
$php = getenv('TEST_PHP_EXECUTABLE');
$pipes = array();
$proc = proc_open(
$php -n -i
,array(0 = array('pipe', 'r'), 1 = array('pipe', 'w'))
,$pipes, dirname(__FILE__), array(), array('binary_pipes' = true)
);
var_dump($proc);
if (!$proc) {
exit(1);
}
$r = array($pipes[1]);
$w = array($pipes[0]);
$e = null;
$ret = stream_select($r, $w, $e, 1);
var_dump($ret === (count($r) + count($w)));
fread($pipes[0], 1);
$r = array($pipes[1]);
$w = array($pipes[0]);
$e = null;
$ret = stream_select($r, $w, $e, 1);
var_dump($ret === (count($r) + count($w)));
foreach($pipes as $pipe) {
fclose($pipe);
}
proc_terminate($proc);
if (defined('SIGKILL')) {
proc_terminate($proc, SIGKILL);
} else {
proc_terminate($proc);
}
proc_close($proc);
?
--EXPECTF--
resource(%d) of type (process)
bool(true)
bool(true)
--
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/standard streamsfuncs.c /ext/standard/tests/streams bug46024.phpt
lbarnaudTue Nov 4 00:42:41 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/streams bug46024.phpt
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
MFH: Fixed bug #46024 (stream_select() doesn't return the correct number)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.27r2=1.58.2.6.2.15.2.28diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.27
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.28
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.27 Thu Oct 30
15:53:18 2008
+++ php-src/ext/standard/streamsfuncs.c Tue Nov 4 00:42:41 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.27 2008/10/30 15:53:18 felipe Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.28 2008/11/04 00:42:41 lbarnaud Exp $
*/
#include php.h
#include php_globals.h
@@ -792,6 +792,12 @@
retval = stream_array_emulate_read_fd_set(r_array TSRMLS_CC);
if (retval 0) {
+ if (w_array != NULL) {
+ zend_hash_clean(Z_ARRVAL_P(w_array));
+ }
+ if (e_array != NULL) {
+ zend_hash_clean(Z_ARRVAL_P(e_array));
+ }
RETURN_LONG(retval);
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/bug46024.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/bug46024.phpt
+++ php-src/ext/standard/tests/streams/bug46024.phpt
--TEST--
Bug #46024 stream_select() doesn't return the correct number
--SKIPIF--
?php if (!getenv('TEST_PHP_EXECUTABLE')) die(TEST_PHP_EXECUTABLE not
defined); ?
--FILE--
?php
$php = getenv('TEST_PHP_EXECUTABLE');
$pipes = array();
$proc = proc_open(
$php -n -i
,array(0 = array('pipe', 'r'), 1 = array('pipe', 'w'))
,$pipes, dirname(__FILE__), array(), array('binary_pipes' = true)
);
var_dump($proc);
if (!$proc) {
exit(1);
}
$r = array($pipes[1]);
$w = array($pipes[0]);
$e = null;
$ret = stream_select($r, $w, $e, 1);
var_dump($ret === (count($r) + count($w)));
fread($pipes[0], 1);
$r = array($pipes[1]);
$w = array($pipes[0]);
$e = null;
$ret = stream_select($r, $w, $e, 1);
var_dump($ret === (count($r) + count($w)));
foreach($pipes as $pipe) {
fclose($pipe);
}
proc_terminate($proc);
if (defined('SIGKILL')) {
proc_terminate($proc, SIGKILL);
} else {
proc_terminate($proc);
}
proc_close($proc);
?
--EXPECTF--
resource(%d) of type (process)
bool(true)
bool(true)
--
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/standard streamsfuncs.c /ext/standard/tests/streams bug46024.phpt
lbarnaudTue Nov 4 00:43:06 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/streams bug46024.phpt
Modified files:
/php-src/ext/standard streamsfuncs.c
/php-srcNEWS
Log:
MFH: Fixed bug #46024 (stream_select() doesn't return the correct number)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.27r2=1.58.2.6.2.28diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.27
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.28
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.27 Thu Oct 30 15:56:23 2008
+++ php-src/ext/standard/streamsfuncs.c Tue Nov 4 00:43:06 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.27 2008/10/30 15:56:23 felipe Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.28 2008/11/04 00:43:06 lbarnaud Exp $ */
#include php.h
#include php_globals.h
@@ -782,6 +782,12 @@
retval = stream_array_emulate_read_fd_set(r_array TSRMLS_CC);
if (retval 0) {
+ if (w_array != NULL) {
+ zend_hash_clean(Z_ARRVAL_P(w_array));
+ }
+ if (e_array != NULL) {
+ zend_hash_clean(Z_ARRVAL_P(e_array));
+ }
RETURN_LONG(retval);
}
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1300r2=1.2027.2.547.2.1301diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1300 php-src/NEWS:1.2027.2.547.2.1301
--- php-src/NEWS:1.2027.2.547.2.1300Mon Nov 3 23:29:50 2008
+++ php-src/NEWSTue Nov 4 00:43:06 2008
@@ -20,6 +20,8 @@
circumstances). (Felipe)
- Fixed bug #46064 (Exception when creating ReflectionProperty object on
dynamicly created property). (Felipe)
+- Fixed bug #46024 (stream_select() doesn't return the correct number).
+ (Arnaud)
- Fixed bug #45529 (new DateTimeZone() and date_create()-getTimezone() behave
different). (Derick)
- Fixed bug #45303 (Opening php:// wrapper in append mode results in a
warning).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/bug46024.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/bug46024.phpt
+++ php-src/ext/standard/tests/streams/bug46024.phpt
--TEST--
Bug #46024 stream_select() doesn't return the correct number
--SKIPIF--
?php if (!getenv('TEST_PHP_EXECUTABLE')) die(TEST_PHP_EXECUTABLE not
defined); ?
--FILE--
?php
$php = getenv('TEST_PHP_EXECUTABLE');
$pipes = array();
$proc = proc_open(
$php -n -i
,array(0 = array('pipe', 'r'), 1 = array('pipe', 'w'))
,$pipes, dirname(__FILE__), array(), array('binary_pipes' = true)
);
var_dump($proc);
if (!$proc) {
exit(1);
}
$r = array($pipes[1]);
$w = array($pipes[0]);
$e = null;
$ret = stream_select($r, $w, $e, 1);
var_dump($ret === (count($r) + count($w)));
fread($pipes[0], 1);
$r = array($pipes[1]);
$w = array($pipes[0]);
$e = null;
$ret = stream_select($r, $w, $e, 1);
var_dump($ret === (count($r) + count($w)));
foreach($pipes as $pipe) {
fclose($pipe);
}
proc_terminate($proc);
if (defined('SIGKILL')) {
proc_terminate($proc, SIGKILL);
} else {
proc_terminate($proc);
}
proc_close($proc);
?
--EXPECTF--
resource(%d) of type (process)
bool(true)
bool(true)
--
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/phar config.m4 util.c
helly Tue Nov 4 01:27:52 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 util.c Log: - MFH Fix dependency from Phar to hash http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.7r2=1.27.2.8diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.7 php-src/ext/phar/config.m4:1.27.2.8 --- php-src/ext/phar/config.m4:1.27.2.7 Thu Oct 9 00:50:46 2008 +++ php-src/ext/phar/config.m4 Tue Nov 4 01:27:52 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.7 2008/10/09 00:50:46 cellog Exp $ +dnl $Id: config.m4,v 1.27.2.8 2008/11/04 01:27:52 helly Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -8,7 +8,9 @@ PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) AC_MSG_CHECKING([for phar openssl support]) if test $PHP_HASH_SHARED != yes; then -AC_DEFINE(PHAR_HASH_OK,1,[ ]) +if test $PHP_HASH != no; then + AC_DEFINE(PHAR_HASH_OK,1,[ ]) +fi else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi @@ -22,6 +24,7 @@ AC_MSG_RESULT([no]) fi fi + PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.39r2=1.55.2.40diff_format=u Index: php-src/ext/phar/util.c diff -u php-src/ext/phar/util.c:1.55.2.39 php-src/ext/phar/util.c:1.55.2.40 --- php-src/ext/phar/util.c:1.55.2.39 Sun Oct 26 05:49:09 2008 +++ php-src/ext/phar/util.c Tue Nov 4 01:27:52 2008 @@ -18,9 +18,12 @@ +--+ */ -/* $Id: util.c,v 1.55.2.39 2008/10/26 05:49:09 cellog Exp $ */ +/* $Id: util.c,v 1.55.2.40 2008/11/04 01:27:52 helly Exp $ */ #include phar_internal.h +#ifdef PHAR_HASH_OK +#include ext/hash/php_hash_sha.h +#endif #ifdef PHAR_HAVE_OPENSSL /* OpenSSL includes */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
