[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat May 19 01:31:03 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2692r2=1.2693diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2692 php-src/ChangeLog:1.2693 --- php-src/ChangeLog:1.2692Fri May 18 01:31:06 2007 +++ php-src/ChangeLog Sat May 19 01:31:02 2007 @@ -1,3 +1,150 @@ +2007-05-18 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + reorder + +2007-05-18 Stanislav Malyshev [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + news about #41401 + +* ZendEngine2/zend_language_parser.y: + fix unary operator precision (bug #41401) + +2007-05-18 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/tests/array/range.phpt + ext/standard/tests/array/range_64bit.phpt + ext/standard/tests/array/range_64bit.phpt: + fix test + add separate test for 64bit + +* ext/standard/file.c + ext/standard/file.c: + fix leak and check for 0 only of the 5th arg was passed + +2007-05-18 Stanislav Malyshev [EMAIL PROTECTED] + +* ZendEngine2/tests/bug41401.phpt: + add test for 41401 + +* ZendEngine2/tests/bug41401.phpt + ZendEngine2/tests/bug41401.phpt: + + file bug41401.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + ZendEngine2/zend_language_parser.y: + fix #41401 - parser precedence on unary operators + +2007-05-18 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/array.c: + fix #41432 (extract() does not accept empty prefix) + +2007-05-18 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.h + ZendEngine2/zend_language_parser.y + ZendEngine2/zend_language_scanner.l + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ext/tokenizer/tokenizer.c + ext/tokenizer/tests/001.phpt + ext/tokenizer/tests/bug26463.phpt: + Improved compilation of heredocs and interpolated strings. (Matt) + +* (PHP_5_2) + NEWS + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.h + ZendEngine2/zend_language_parser.y + ZendEngine2/zend_language_scanner.l + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ext/tokenizer/tokenizer.c + ext/tokenizer/tests/001.phpt: + Improved compilation of heredocs and interpolated strings. (Matt, Dmitry) + +2007-05-18 Johannes Schlüter [EMAIL PROTECTED] + +* README.UPDATING_TO_PHP6: + - Use the right variable name + +2007-05-18 Rasmus Lerdorf [EMAIL PROTECTED] + +* TSRM/tsrm_virtual_cwd.c + ext/standard/basic_functions.c + ext/standard/lcg.c + ext/standard/php_ext_syslog.h + ext/standard/php_lcg.h + ext/standard/syslog.c: + MFB syscall optimizations + +2007-05-18 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/standard/file.c: + MFH: fix #41430 (Fatal error with negative values of maxlen parameter of + file_get_contents()) + +* ext/standard/file.c: + fix #41430 (Fatal error with negative values of maxlen parameter of + file_get_contents()) + +* (PHP_5_2) + NEWS: + BFN + +* (PHP_5_2) + ZendEngine2/zend_execute_API.c + ZendEngine2/tests/bug41421.phpt: + MFH: fix #41421 (Uncaught exception from a stream wrapper segfaults) + +* ZendEngine2/zend_execute_API.c + ZendEngine2/tests/bug41421.phpt + ZendEngine2/tests/bug41421.phpt: + fix #41421 (Uncaught exception from a stream wrapper segfaults) + +2007-05-18 Rasmus Lerdorf [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + TSRM/tsrm_virtual_cwd.c + ext/standard/php_lcg.h: + Get rid of a stray time() syscall in tsrm and clean up lcg rinit + +2007-05-18 Antony Dovgal [EMAIL PROTECTED] + +* ext/filter/tests/031.phpt + ext/filter/tests/031.phpt + ext/filter/tests/033.phpt + ext/filter/tests/033.phpt + ext/filter/tests/044.phpt + ext/filter/tests/044.phpt + ext/filter/tests/filter_data.phpt + ext/filter/tests/filter_data.phpt + ext/mysqli/tests/019.phpt + ext/mysqli/tests/019.phpt + ext/pdo_mysql/tests/bug_33689.phpt + ext/pdo_mysql/tests/bug_33689.phpt + ext/session/tests/007.phpt + ext/session/tests/008-php4.2.3.phpt + ext/standard/tests/strings/addcslashes.phpt + ext/standard/tests/strings/str_repeat.phpt + ext/standard/tests/strings/str_replace.phpt + ext/standard/tests/strings/strpos.phpt + ext/wddx/tests/001.phpt + ext/wddx/tests/001.phpt + tests/lang/034.phpt + tests/lang/034.phpt: + fix tests + 2007-05-17 Nuno Lopes [EMAIL PROTECTED] * (PHP_5_2)
[PHP-CVS] cvs: CVSROOT /pear avail
arnaud Fri May 18 08:06:48 2007 UTC Modified files: /CVSROOT/pear avail Log: David Sanders (shangxiao) has karma for Math_Combinatorics http://cvs.php.net/viewvc.cgi/CVSROOT/pear/avail?r1=1.6r2=1.7diff_format=u Index: CVSROOT/pear/avail diff -u CVSROOT/pear/avail:1.6 CVSROOT/pear/avail:1.7 --- CVSROOT/pear/avail:1.6 Wed May 16 13:46:40 2007 +++ CVSROOT/pear/avail Fri May 18 08:06:47 2007 @@ -134,4 +134,5 @@ avail|msaraujo|pear/Text_CAPTCHA_Numeral avail|fernandoc,marcelo|peardoc/pt_BR +avail|shangxiao|pear/Math_Combinatorics # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT /pear avail
arnaud Fri May 18 09:46:27 2007 UTC Modified files: /CVSROOT/pear avail Log: peardoc/zh for essayr http://cvs.php.net/viewvc.cgi/CVSROOT/pear/avail?r1=1.7r2=1.8diff_format=u Index: CVSROOT/pear/avail diff -u CVSROOT/pear/avail:1.7 CVSROOT/pear/avail:1.8 --- CVSROOT/pear/avail:1.7 Fri May 18 08:06:47 2007 +++ CVSROOT/pear/avail Fri May 18 09:46:27 2007 @@ -135,4 +135,5 @@ avail|fernandoc,marcelo|peardoc/pt_BR avail|shangxiao|pear/Math_Combinatorics +avail|essayr|peardoc/zh # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
tony2001Fri May 18 11:52:47 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.715r2=1.2027.2.547.2.716diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.715 php-src/NEWS:1.2027.2.547.2.716 --- php-src/NEWS:1.2027.2.547.2.715 Fri May 18 11:36:54 2007 +++ php-src/NEWSFri May 18 11:52:47 2007 @@ -17,6 +17,8 @@ - Fixed altering $this via argument named this. (Dmitry) - Fixed PHP CLI to use the php.ini from the binary location. (Hannes) - Fixed segfault in strripos(). (Tony, Joxean Koret) +- Fixed bug #41421 (Uncaught exception from a stream wrapper segfaults). + (Tony, Dmitry) - Fixed bug #41403 (json_decode cannot decode floats if localeconv decimal_point is not '.'). (Tony) - Fixed bug #41394 (dbase_create creates file with corrupted header). (Tony) -- 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 php_lcg.h TSRM tsrm_virtual_cwd.c
rasmus Fri May 18 11:36:55 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/TSRM tsrm_virtual_cwd.c
/php-src/ext/standard php_lcg.h
Log:
Get rid of a stray time() syscall in tsrm and clean up lcg rinit
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.714r2=1.2027.2.547.2.715diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.714 php-src/NEWS:1.2027.2.547.2.715
--- php-src/NEWS:1.2027.2.547.2.714 Thu May 17 15:13:51 2007
+++ php-src/NEWSFri May 18 11:36:54 2007
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2007, PHP 5.2.3
+- Optimized out a couple of per-request syscalls (Rasmus)
- Upgraded SQLite 3 to version 3.3.16 (Ilia)
- Added PDO::FETCH_KEY_PAIR mode that will fetch a 2 column result set into
an associated array. (Ilia)
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.26r2=1.74.2.9.2.27diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.26
TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.27
--- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.26 Thu Apr 12 15:28:58 2007
+++ TSRM/tsrm_virtual_cwd.c Fri May 18 11:36:55 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.26 2007/04/12 15:28:58 dmitry Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.27 2007/05/18 11:36:55 rasmus Exp $ */
#include sys/types.h
#include sys/stat.h
@@ -31,6 +31,7 @@
#include tsrm_virtual_cwd.h
#include tsrm_strtok_r.h
+#include SAPI.h
#ifdef TSRM_WIN32
#include io.h
@@ -518,7 +519,7 @@
}
if (use_cache) {
- t = CWDG(realpath_cache_ttl)?time(NULL):0;
+ t = CWDG(realpath_cache_ttl)?sapi_get_request_time(TSRMLS_C):0;
if ((bucket = realpath_cache_find(path, path_length, t
TSRMLS_CC)) != NULL) {
int len = bucket-realpath_len;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_lcg.h?r1=1.21.2.1.2.1r2=1.21.2.1.2.2diff_format=u
Index: php-src/ext/standard/php_lcg.h
diff -u php-src/ext/standard/php_lcg.h:1.21.2.1.2.1
php-src/ext/standard/php_lcg.h:1.21.2.1.2.2
--- php-src/ext/standard/php_lcg.h:1.21.2.1.2.1 Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/php_lcg.h Fri May 18 11:36:55 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_lcg.h,v 1.21.2.1.2.1 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: php_lcg.h,v 1.21.2.1.2.2 2007/05/18 11:36:55 rasmus Exp $ */
#ifndef PHP_LCG_H
#define PHP_LCG_H
@@ -33,7 +33,6 @@
PHP_FUNCTION(lcg_value);
PHP_MINIT_FUNCTION(lcg);
-PHP_RINIT_FUNCTION(lcg);
#ifdef ZTS
#define LCG(v) TSRMG(lcg_globals_id, php_lcg_globals *, v)
--
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/filter/tests 031.phpt 044.phpt filter_data.phpt /ext/session/tests 007.phpt 008-php4.2.3.phpt /ext/standard/tests/strings addcslashes.phpt str_replace.phpt strpo
tony2001Fri May 18 11:29:56 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings strpos.phpt str_replace.phpt
addcslashes.phpt
/php-src/ext/wddx/tests 001.phpt
/php-src/ext/filter/tests filter_data.phpt 031.phpt 044.phpt
/php-src/tests/lang 034.phpt
/php-src/ext/session/tests 008-php4.2.3.phpt 007.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strpos.phpt?r1=1.2.6.1r2=1.2.6.2diff_format=u
Index: php-src/ext/standard/tests/strings/strpos.phpt
diff -u php-src/ext/standard/tests/strings/strpos.phpt:1.2.6.1
php-src/ext/standard/tests/strings/strpos.phpt:1.2.6.2
--- php-src/ext/standard/tests/strings/strpos.phpt:1.2.6.1 Sat May 12
10:15:02 2007
+++ php-src/ext/standard/tests/strings/strpos.phpt Fri May 18 11:29:55 2007
@@ -1,5 +1,7 @@
--TEST--
Test strpos() function
+--INI--
+precision=14
--FILE--
?php
/* Prototype: int strpos ( string $haystack, mixed $needle [, int $offset] );
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_replace.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/standard/tests/strings/str_replace.phpt
diff -u php-src/ext/standard/tests/strings/str_replace.phpt:1.1.2.5
php-src/ext/standard/tests/strings/str_replace.phpt:1.1.2.6
--- php-src/ext/standard/tests/strings/str_replace.phpt:1.1.2.5 Sat May 12
10:15:02 2007
+++ php-src/ext/standard/tests/strings/str_replace.phpt Fri May 18 11:29:55 2007
@@ -1,5 +1,7 @@
--TEST--
Test str_replace() function
+--INI--
+precision=14
--FILE--
?php
/*
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addcslashes.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/strings/addcslashes.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/001.phpt?r1=1.5.4.1r2=1.5.4.1.2.1diff_format=u
Index: php-src/ext/wddx/tests/001.phpt
diff -u php-src/ext/wddx/tests/001.phpt:1.5.4.1
php-src/ext/wddx/tests/001.phpt:1.5.4.1.2.1
--- php-src/ext/wddx/tests/001.phpt:1.5.4.1 Wed Dec 21 11:42:06 2005
+++ php-src/ext/wddx/tests/001.phpt Fri May 18 11:29:55 2007
@@ -2,6 +2,8 @@
wddx deserialization test
--SKIPIF--
?php if (!extension_loaded(wddx)) print skip; ?
+--INI--
+precision=14
--FILE--
?php
$path = dirname(__FILE__);
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/filter_data.phpt?r1=1.4.2.5r2=1.4.2.6diff_format=u
Index: php-src/ext/filter/tests/filter_data.phpt
diff -u php-src/ext/filter/tests/filter_data.phpt:1.4.2.5
php-src/ext/filter/tests/filter_data.phpt:1.4.2.6
--- php-src/ext/filter/tests/filter_data.phpt:1.4.2.5 Tue Dec 19 14:16:23 2006
+++ php-src/ext/filter/tests/filter_data.phpt Fri May 18 11:29:55 2007
@@ -2,6 +2,8 @@
Simple filter_var() tests
--SKIPIF--
?php if (!extension_loaded(filter)) die(skip); ?
+--INI--
+precision=14
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/031.phpt?r1=1.2.2.4r2=1.2.2.5diff_format=u
Index: php-src/ext/filter/tests/031.phpt
diff -u php-src/ext/filter/tests/031.phpt:1.2.2.4
php-src/ext/filter/tests/031.phpt:1.2.2.5
--- php-src/ext/filter/tests/031.phpt:1.2.2.4 Tue Dec 19 14:16:23 2006
+++ php-src/ext/filter/tests/031.phpt Fri May 18 11:29:55 2007
@@ -2,6 +2,8 @@
filter_var() and FLOAT
--SKIPIF--
?php if (!extension_loaded(filter)) die(skip); ?
+--INI--
+precision=14
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/044.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/filter/tests/044.phpt
diff -u php-src/ext/filter/tests/044.phpt:1.1.2.2
php-src/ext/filter/tests/044.phpt:1.1.2.3
--- php-src/ext/filter/tests/044.phpt:1.1.2.2 Tue Dec 19 14:16:23 2006
+++ php-src/ext/filter/tests/044.phpt Fri May 18 11:29:55 2007
@@ -2,6 +2,8 @@
Integer validation with spaces
--SKIPIF--
?php if (!extension_loaded(filter)) die(skip); ?
+--INI--
+precision=14
--FILE--
?php
$vals = array(
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/034.phpt?r1=1.8.4.1r2=1.8.4.2diff_format=u
Index: php-src/tests/lang/034.phpt
diff -u php-src/tests/lang/034.phpt:1.8.4.1 php-src/tests/lang/034.phpt:1.8.4.2
--- php-src/tests/lang/034.phpt:1.8.4.1 Sun Aug 27 15:06:53 2006
+++ php-src/tests/lang/034.phpt Fri May 18 11:29:55 2007
@@ -1,5 +1,7 @@
--TEST--
Bug #12647 (Locale settings affecting float parsing)
+--INI--
+precision=14
--SKIPIF--
?php # try to activate a german locale
if (setlocale(LC_NUMERIC, de_DE, de, german, ge, de_DE.ISO8859-1)
=== FALSE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/008-php4.2.3.phpt?r1=1.7.4.1r2=1.7.4.2diff_format=u
Index: php-src/ext/session/tests/008-php4.2.3.phpt
diff -u php-src/ext/session/tests/008-php4.2.3.phpt:1.7.4.1
php-src/ext/session/tests/008-php4.2.3.phpt:1.7.4.2
--- php-src/ext/session/tests/008-php4.2.3.phpt:1.7.4.1 Mon Sep 18 16:12:13 2006
+++ php-src/ext/session/tests/008-php4.2.3.phpt Fri May 18 11:29:55 2007
@@ -18,6
[PHP-CVS] cvs: php-src /ext/filter/tests 031.phpt 044.phpt filter_data.phpt /ext/wddx/tests 001.phpt /tests/lang 034.phpt
tony2001Fri May 18 11:29:40 2007 UTC Modified files: /php-src/ext/wddx/tests 001.phpt /php-src/ext/filter/tests filter_data.phpt 031.phpt 044.phpt /php-src/tests/lang 034.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/001.phpt?r1=1.8r2=1.9diff_format=u Index: php-src/ext/wddx/tests/001.phpt diff -u php-src/ext/wddx/tests/001.phpt:1.8 php-src/ext/wddx/tests/001.phpt:1.9 --- php-src/ext/wddx/tests/001.phpt:1.8 Mon Aug 7 22:19:45 2006 +++ php-src/ext/wddx/tests/001.phpt Fri May 18 11:29:40 2007 @@ -2,6 +2,8 @@ wddx unserialization test --SKIPIF-- ?php if (!extension_loaded(wddx)) print skip; ? +--INI-- +precision=14 --FILE-- ?php $path = dirname(__FILE__); http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/filter_data.phpt?r1=1.9r2=1.10diff_format=u Index: php-src/ext/filter/tests/filter_data.phpt diff -u php-src/ext/filter/tests/filter_data.phpt:1.9 php-src/ext/filter/tests/filter_data.phpt:1.10 --- php-src/ext/filter/tests/filter_data.phpt:1.9 Tue Dec 19 14:16:08 2006 +++ php-src/ext/filter/tests/filter_data.phpt Fri May 18 11:29:40 2007 @@ -2,6 +2,8 @@ Simple filter_var() tests --SKIPIF-- ?php if (!extension_loaded(filter)) die(skip); ? +--INI-- +precision=14 --FILE-- ?php http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/031.phpt?r1=1.6r2=1.7diff_format=u Index: php-src/ext/filter/tests/031.phpt diff -u php-src/ext/filter/tests/031.phpt:1.6 php-src/ext/filter/tests/031.phpt:1.7 --- php-src/ext/filter/tests/031.phpt:1.6 Tue Dec 19 14:16:08 2006 +++ php-src/ext/filter/tests/031.phpt Fri May 18 11:29:40 2007 @@ -2,6 +2,8 @@ filter_var() and FLOAT --SKIPIF-- ?php if (!extension_loaded(filter)) die(skip); ? +--INI-- +precision=14 --FILE-- ?php http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/044.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/filter/tests/044.phpt diff -u php-src/ext/filter/tests/044.phpt:1.3 php-src/ext/filter/tests/044.phpt:1.4 --- php-src/ext/filter/tests/044.phpt:1.3 Tue Dec 19 14:16:08 2006 +++ php-src/ext/filter/tests/044.phpt Fri May 18 11:29:40 2007 @@ -2,6 +2,8 @@ Integer validation with spaces --SKIPIF-- ?php if (!extension_loaded(filter)) die(skip); ? +--INI-- +precision=14 --FILE-- ?php $vals = array( http://cvs.php.net/viewvc.cgi/php-src/tests/lang/034.phpt?r1=1.11r2=1.12diff_format=u Index: php-src/tests/lang/034.phpt diff -u php-src/tests/lang/034.phpt:1.11 php-src/tests/lang/034.phpt:1.12 --- php-src/tests/lang/034.phpt:1.11Mon Feb 19 20:02:08 2007 +++ php-src/tests/lang/034.phpt Fri May 18 11:29:40 2007 @@ -6,6 +6,8 @@ print skip; } ? +--INI-- +precision=14 --FILE-- ?php # activate the german locale -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filter/tests 033.phpt /ext/mysqli/tests 019.phpt /ext/pdo_mysql/tests bug_33689.phpt
tony2001Fri May 18 11:47:31 2007 UTC
Modified files:
/php-src/ext/pdo_mysql/testsbug_33689.phpt
/php-src/ext/filter/tests 033.phpt
/php-src/ext/mysqli/tests 019.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug_33689.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/pdo_mysql/tests/bug_33689.phpt
diff -u php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.3
php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.4
--- php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.3 Mon May 7 17:23:03 2007
+++ php-src/ext/pdo_mysql/tests/bug_33689.phpt Fri May 18 11:47:31 2007
@@ -7,6 +7,8 @@
require 'ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?
+--INI--
+precision=14
--FILE--
?php
require 'ext/pdo/tests/pdo_test.inc';
@@ -24,7 +26,7 @@
print_r($stmt-getColumnMeta(0));
$stmt-execute();
print_r($stmt-getColumnMeta(0));
-
+?
--EXPECTF--
object(PDOStatement)#%d (1) {
[queryString]=
@@ -43,6 +45,7 @@
[0] = not_null
)
+[table] = test
[name] = bar
[len] = 11
[precision] = 0
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/033.phpt?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/filter/tests/033.phpt
diff -u php-src/ext/filter/tests/033.phpt:1.8
php-src/ext/filter/tests/033.phpt:1.9
--- php-src/ext/filter/tests/033.phpt:1.8 Wed Dec 20 19:20:22 2006
+++ php-src/ext/filter/tests/033.phpt Fri May 18 11:47:31 2007
@@ -2,6 +2,8 @@
Test all filters returned by filter_list()
--SKIPIF--
?php if (!extension_loaded(filter)) die(skip); ?
+--INI--
+precision=14
--FILE--
?php
include dirname(__FILE__) . '/033_run.inc';
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/019.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/mysqli/tests/019.phpt
diff -u php-src/ext/mysqli/tests/019.phpt:1.7
php-src/ext/mysqli/tests/019.phpt:1.8
--- php-src/ext/mysqli/tests/019.phpt:1.7 Tue Sep 26 13:06:13 2006
+++ php-src/ext/mysqli/tests/019.phpt Fri May 18 11:47:31 2007
@@ -2,6 +2,8 @@
mysqli fetch (bind_param + bind_result)
--SKIPIF--
?php require_once('skipif.inc'); ?
+--INI--
+precision=14
--FILE--
?php
include connect.inc;
--
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/filter/tests 033.phpt /ext/mysqli/tests 019.phpt /ext/pdo_mysql/tests bug_33689.phpt /ext/standard/tests/strings str_repeat.phpt
tony2001Fri May 18 11:47:58 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_mysql/testsbug_33689.phpt
/php-src/ext/standard/tests/strings str_repeat.phpt
/php-src/ext/filter/tests 033.phpt
/php-src/ext/mysqli/tests 019.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug_33689.phpt?r1=1.1.2.2.2.3r2=1.1.2.2.2.4diff_format=u
Index: php-src/ext/pdo_mysql/tests/bug_33689.phpt
diff -u php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.1.2.2.2.3
php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.1.2.2.2.4
--- php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.1.2.2.2.3 Mon May 7
18:03:01 2007
+++ php-src/ext/pdo_mysql/tests/bug_33689.phpt Fri May 18 11:47:58 2007
@@ -25,7 +25,7 @@
print_r($stmt-getColumnMeta(0));
$stmt-execute();
print_r($stmt-getColumnMeta(0));
-
+?
--EXPECTF--
object(PDOStatement)#%d (1) {
[queryString]=
@@ -44,6 +44,7 @@
[0] = not_null
)
+[table] = test
[name] = bar
[len] = 11
[precision] = 0
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_repeat.phpt?r1=1.2.6.1r2=1.2.6.2diff_format=u
Index: php-src/ext/standard/tests/strings/str_repeat.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/033.phpt?r1=1.3.2.5r2=1.3.2.6diff_format=u
Index: php-src/ext/filter/tests/033.phpt
diff -u php-src/ext/filter/tests/033.phpt:1.3.2.5
php-src/ext/filter/tests/033.phpt:1.3.2.6
--- php-src/ext/filter/tests/033.phpt:1.3.2.5 Wed Dec 20 19:20:01 2006
+++ php-src/ext/filter/tests/033.phpt Fri May 18 11:47:58 2007
@@ -2,6 +2,8 @@
Test all filters returned by filter_list()
--SKIPIF--
?php if (!extension_loaded(filter)) die(skip); ?
+--INI--
+precision=14
--FILE--
?php
include dirname(__FILE__) . '/033_run.inc';
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/019.phpt?r1=1.5.4.1r2=1.5.4.2diff_format=u
Index: php-src/ext/mysqli/tests/019.phpt
diff -u php-src/ext/mysqli/tests/019.phpt:1.5.4.1
php-src/ext/mysqli/tests/019.phpt:1.5.4.2
--- php-src/ext/mysqli/tests/019.phpt:1.5.4.1 Tue Jul 11 23:45:28 2006
+++ php-src/ext/mysqli/tests/019.phpt Fri May 18 11:47:58 2007
@@ -2,6 +2,8 @@
mysqli fetch (bind_param + bind_result)
--SKIPIF--
?php require_once('skipif.inc'); ?
+--INI--
+precision=14
--FILE--
?php
include connect.inc;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
tony2001Fri May 18 12:05:55 2007 UTC
Modified files:
/php-src/ext/standard file.c
Log:
fix #41430 (Fatal error with negative values of maxlen parameter of
file_get_contents())
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.487r2=1.488diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.487 php-src/ext/standard/file.c:1.488
--- php-src/ext/standard/file.c:1.487 Mon Apr 16 09:43:52 2007
+++ php-src/ext/standard/file.c Fri May 18 12:05:55 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.487 2007/04/16 09:43:52 dmitry Exp $ */
+/* $Id: file.c,v 1.488 2007/05/18 12:05:55 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -566,6 +566,11 @@
RETURN_FALSE;
}
+ if (maxlen 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Length must be
greater than or equal to zero);
+ RETURN_FALSE;
+ }
+
if (offset 0 php_stream_seek(stream, offset, SEEK_SET) 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to seek to
position %ld in the stream, offset);
php_stream_close(stream);
--
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 file.c
tony2001Fri May 18 12:06:44 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard file.c
/php-srcNEWS
Log:
MFH: fix #41430 (Fatal error with negative values of maxlen parameter of
file_get_contents())
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.17r2=1.409.2.6.2.18diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.17
php-src/ext/standard/file.c:1.409.2.6.2.18
--- php-src/ext/standard/file.c:1.409.2.6.2.17 Fri Feb 23 16:22:20 2007
+++ php-src/ext/standard/file.c Fri May 18 12:06:44 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.17 2007/02/23 16:22:20 tony2001 Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.18 2007/05/18 12:06:44 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -545,6 +545,11 @@
RETURN_FALSE;
}
+ if (maxlen 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Length must be
greater than or equal to zero);
+ RETURN_FALSE;
+ }
+
if (offset 0 php_stream_seek(stream, offset, SEEK_SET) 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to seek to
position %ld in the stream, offset);
php_stream_close(stream);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.716r2=1.2027.2.547.2.717diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.716 php-src/NEWS:1.2027.2.547.2.717
--- php-src/NEWS:1.2027.2.547.2.716 Fri May 18 11:52:47 2007
+++ php-src/NEWSFri May 18 12:06:44 2007
@@ -17,6 +17,8 @@
- Fixed altering $this via argument named this. (Dmitry)
- Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
- Fixed segfault in strripos(). (Tony, Joxean Koret)
+- Fixed bug #41430 (Fatal error with negative values of maxlen parameter of
+ file_get_contents()). (Tony)
- Fixed bug #41421 (Uncaught exception from a stream wrapper segfaults).
(Tony, Dmitry)
- Fixed bug #41403 (json_decode cannot decode floats if localeconv
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c lcg.c php_ext_syslog.h php_lcg.h syslog.c TSRM tsrm_virtual_cwd.c
rasmus Fri May 18 12:15:02 2007 UTC
Modified files:
/TSRM tsrm_virtual_cwd.c
/php-src/ext/standard basic_functions.c lcg.c php_ext_syslog.h
php_lcg.h syslog.c
Log:
MFB syscall optimizations
# boredom on the plane to China...
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.106r2=1.107diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.106 TSRM/tsrm_virtual_cwd.c:1.107
--- TSRM/tsrm_virtual_cwd.c:1.106 Thu Apr 12 15:29:10 2007
+++ TSRM/tsrm_virtual_cwd.c Fri May 18 12:15:01 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.106 2007/04/12 15:29:10 dmitry Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.107 2007/05/18 12:15:01 rasmus Exp $ */
#include sys/types.h
#include sys/stat.h
@@ -517,7 +517,7 @@
}
if (use_cache) {
- t = CWDG(realpath_cache_ttl)?time(NULL):0;
+ t = CWDG(realpath_cache_ttl)?sapi_get_request_time(TSRMLS_C):0;
if ((bucket = realpath_cache_find(path, path_length, t
TSRMLS_CC)) != NULL) {
int len = bucket-realpath_len;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.856r2=1.857diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.856
php-src/ext/standard/basic_functions.c:1.857
--- php-src/ext/standard/basic_functions.c:1.856Thu May 10 16:27:16 2007
+++ php-src/ext/standard/basic_functions.c Fri May 18 12:15:01 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.856 2007/05/10 16:27:16 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.857 2007/05/18 12:15:01 rasmus Exp $ */
#include php.h
#include php_streams.h
@@ -4138,8 +4138,6 @@
#endif
BG(user_shutdown_function_names) = NULL;
- PHP_RINIT(lcg)(INIT_FUNC_ARGS_PASSTHRU);
-
PHP_RINIT(filestat)(INIT_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
PHP_RINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU);
@@ -4192,8 +4190,10 @@
PHP_RSHUTDOWN(filestat)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
+#ifdef PHP_WIN32
PHP_RSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
+#endif
PHP_RSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_RSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_RSHUTDOWN(streams)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/lcg.c?r1=1.44r2=1.45diff_format=u
Index: php-src/ext/standard/lcg.c
diff -u php-src/ext/standard/lcg.c:1.44 php-src/ext/standard/lcg.c:1.45
--- php-src/ext/standard/lcg.c:1.44 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/lcg.c Fri May 18 12:15:01 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: lcg.c,v 1.44 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: lcg.c,v 1.45 2007/05/18 12:15:01 rasmus Exp $ */
#include php.h
#include php_lcg.h
@@ -106,14 +106,6 @@
return SUCCESS;
}
-PHP_RINIT_FUNCTION(lcg)
-{
- if (!LCG(seeded)) {
- lcg_seed(TSRMLS_C);
- }
- return SUCCESS;
-}
-
/* {{{ proto float lcg_value() U
Returns a value from the combined linear congruential generator */
PHP_FUNCTION(lcg_value)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_ext_syslog.h?r1=1.15r2=1.16diff_format=u
Index: php-src/ext/standard/php_ext_syslog.h
diff -u php-src/ext/standard/php_ext_syslog.h:1.15
php-src/ext/standard/php_ext_syslog.h:1.16
--- php-src/ext/standard/php_ext_syslog.h:1.15 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/php_ext_syslog.h Fri May 18 12:15:01 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ext_syslog.h,v 1.15 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: php_ext_syslog.h,v 1.16 2007/05/18 12:15:01 rasmus Exp $ */
#ifndef PHP_EXT_SYSLOG_H
#define PHP_EXT_SYSLOG_H
@@ -27,7 +27,9 @@
PHP_MINIT_FUNCTION(syslog);
PHP_RINIT_FUNCTION(syslog);
+#ifdef PHP_WIN32
PHP_RSHUTDOWN_FUNCTION(syslog);
+#endif
PHP_MSHUTDOWN_FUNCTION(syslog);
PHP_FUNCTION(openlog);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_lcg.h?r1=1.23r2=1.24diff_format=u
Index: php-src/ext/standard/php_lcg.h
diff -u php-src/ext/standard/php_lcg.h:1.23 php-src/ext/standard/php_lcg.h:1.24
--- php-src/ext/standard/php_lcg.h:1.23 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/php_lcg.h Fri May 18 12:15:01 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_lcg.h,v 1.23 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: php_lcg.h,v 1.24 2007/05/18 12:15:01 rasmus Exp $ */
#ifndef PHP_LCG_H
#define PHP_LCG_H
@@ -33,7 +33,6 @@
[PHP-CVS] cvs: php-src / README.UPDATING_TO_PHP6
johannesFri May 18 12:38:07 2007 UTC Modified files: /php-srcREADME.UPDATING_TO_PHP6 Log: - Use the right variable name http://cvs.php.net/viewvc.cgi/php-src/README.UPDATING_TO_PHP6?r1=1.4r2=1.5diff_format=u Index: php-src/README.UPDATING_TO_PHP6 diff -u php-src/README.UPDATING_TO_PHP6:1.4 php-src/README.UPDATING_TO_PHP6:1.5 --- php-src/README.UPDATING_TO_PHP6:1.4 Thu Mar 30 14:08:38 2006 +++ php-src/README.UPDATING_TO_PHP6 Fri May 18 12:38:07 2007 @@ -128,7 +128,7 @@ $HTTP_COOKIE_VARS = $_COOKIE; $HTTP_SERVER_VARS = $_SERVER; $HTTP_ENV_VARS = $_ENV; - $HTTP_FILES_VARS = $_FILES; + $HTTP_POST_FILES = $_FILES; } ? -- 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/tokenizer tokenizer.c /ext/tokenizer/tests 001.phpt ZendEngine2 zend_compile.c zend_compile.h zend_language_parser.y zend_language_scanner.l zend_vm_def.
dmitry Fri May 18 13:12:06 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/ZendEngine2zend_compile.c zend_compile.h zend_language_parser.y
zend_language_scanner.l zend_vm_def.h
zend_vm_execute.h
/php-src/ext/tokenizer tokenizer.c
/php-src/ext/tokenizer/tests001.phpt
Log:
Improved compilation of heredocs and interpolated strings. (Matt, Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.717r2=1.2027.2.547.2.718diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.717 php-src/NEWS:1.2027.2.547.2.718
--- php-src/NEWS:1.2027.2.547.2.717 Fri May 18 12:06:44 2007
+++ php-src/NEWSFri May 18 13:12:03 2007
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2007, PHP 5.2.3
+- Improved compilation of heredocs and interpolated strings. (Matt, Dmitry)
- Optimized out a couple of per-request syscalls (Rasmus)
- Upgraded SQLite 3 to version 3.3.16 (Ilia)
- Added PDO::FETCH_KEY_PAIR mode that will fetch a 2 column result set into
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.39r2=1.647.2.27.2.40diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.39
ZendEngine2/zend_compile.c:1.647.2.27.2.40
--- ZendEngine2/zend_compile.c:1.647.2.27.2.39 Fri May 11 09:39:36 2007
+++ ZendEngine2/zend_compile.c Fri May 18 13:12:03 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_compile.c,v 1.647.2.27.2.39 2007/05/11 09:39:36 tony2001 Exp $ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.40 2007/05/18 13:12:03 dmitry Exp $ */
#include zend_language_parser.h
#include zend.h
@@ -941,24 +941,25 @@
}
-void zend_do_add_char(znode *result, znode *op1, znode *op2 TSRMLS_DC)
-{
- zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-
- opline-opcode = ZEND_ADD_CHAR;
- opline-op1 = *op1;
- opline-op2 = *op2;
- opline-op2.op_type = IS_CONST;
- opline-result = opline-op1;
- *result = opline-result;
-}
-
-
void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC)
{
- zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+ zend_op *opline;
- opline-opcode = ZEND_ADD_STRING;
+ if (Z_STRLEN(op2-u.constant) 1) {
+ opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+ opline-opcode = ZEND_ADD_STRING;
+ } else if (Z_STRLEN(op2-u.constant) == 1) {
+ int ch = *Z_STRVAL(op2-u.constant);
+
+ /* Free memory and use ZEND_ADD_CHAR in case of 1 character
strings */
+ efree(Z_STRVAL(op2-u.constant));
+ ZVAL_LONG(op2-u.constant, ch);
+ opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+ opline-opcode = ZEND_ADD_CHAR;
+ } else { /* String can be empty after a variable at the end of a
heredoc */
+ efree(Z_STRVAL(op2-u.constant));
+ return;
+ }
opline-op1 = *op1;
opline-op2 = *op2;
opline-op2.op_type = IS_CONST;
@@ -3930,24 +3931,6 @@
}
-void zend_do_end_heredoc(TSRMLS_D)
-{
- int opline_num = get_next_op_number(CG(active_op_array))-1;
- zend_op *opline = CG(active_op_array)-opcodes[opline_num];
-
- if (opline-opcode != ZEND_ADD_STRING) {
- return;
- }
-
-
opline-op2.u.constant.value.str.val[(opline-op2.u.constant.value.str.len--)-1]
= 0;
- if (opline-op2.u.constant.value.str.len0) {
- if
(opline-op2.u.constant.value.str.val[opline-op2.u.constant.value.str.len-1]=='\r')
{
-
opline-op2.u.constant.value.str.val[(opline-op2.u.constant.value.str.len--)-1]
= 0;
- }
- }
-}
-
-
void zend_do_exit(znode *result, znode *message TSRMLS_DC)
{
zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
@@ -4136,12 +4119,12 @@
{
int retval;
-again:
if (CG(increment_lineno)) {
CG(zend_lineno)++;
CG(increment_lineno) = 0;
}
+again:
Z_TYPE(zendlval-u.constant) = IS_LONG;
retval = lex_scan(zendlval-u.constant TSRMLS_CC);
switch (retval) {
@@ -4152,8 +4135,7 @@
goto again;
case T_CLOSE_TAG:
- if (LANG_SCNG(yy_text)[LANG_SCNG(yy_leng)-1]=='\n'
- ||
(LANG_SCNG(yy_text)[LANG_SCNG(yy_leng)-2]=='\r'
LANG_SCNG(yy_text)[LANG_SCNG(yy_leng)-1])) {
+ if (LANG_SCNG(yy_text)[LANG_SCNG(yy_leng)-1] != '') {
CG(increment_lineno) = 1;
}
retval =
[PHP-CVS] cvs: php-src /ext/tokenizer tokenizer.c /ext/tokenizer/tests 001.phpt bug26463.phpt ZendEngine2 zend_compile.c zend_compile.h zend_language_parser.y zend_language_scanner.l zend_vm_def.h z
dmitry Fri May 18 13:12:47 2007 UTC
Modified files:
/ZendEngine2zend_compile.c zend_compile.h zend_language_parser.y
zend_language_scanner.l zend_vm_def.h
zend_vm_execute.h
/php-src/ext/tokenizer tokenizer.c
/php-src/ext/tokenizer/tests001.phpt bug26463.phpt
Log:
Improved compilation of heredocs and interpolated strings. (Matt)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.748r2=1.749diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.748 ZendEngine2/zend_compile.c:1.749
--- ZendEngine2/zend_compile.c:1.748Fri May 11 09:38:52 2007
+++ ZendEngine2/zend_compile.c Fri May 18 13:12:47 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_compile.c,v 1.748 2007/05/11 09:38:52 tony2001 Exp $ */
+/* $Id: zend_compile.c,v 1.749 2007/05/18 13:12:47 dmitry Exp $ */
#include zend_language_parser.h
#include zend.h
@@ -989,25 +989,25 @@
}
-void zend_do_add_char(znode *result, znode *op1, znode *op2 TSRMLS_DC)
-{
- zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-
- opline-opcode = ZEND_ADD_CHAR;
- opline-op1 = *op1;
- opline-op2 = *op2;
- opline-op2.op_type = IS_CONST;
- opline-extended_value = CG(literal_type);
- opline-result = opline-op1;
- *result = opline-result;
-}
-
-
void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC)
{
- zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+ zend_op *opline;
- opline-opcode = ZEND_ADD_STRING;
+ if (Z_UNILEN(op2-u.constant) 1) {
+ opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+ opline-opcode = ZEND_ADD_STRING;
+ } else if (Z_UNILEN(op2-u.constant) == 1) {
+ int ch = (Z_TYPE(op2-u.constant) == IS_UNICODE) ?
*Z_USTRVAL(op2-u.constant) : *Z_STRVAL(op2-u.constant);
+
+ /* Free memory and use ZEND_ADD_CHAR in case of 1 character
strings */
+ efree(Z_UNIVAL(op2-u.constant).v);
+ ZVAL_LONG(op2-u.constant, ch);
+ opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+ opline-opcode = ZEND_ADD_CHAR;
+ } else { /* String can be empty after a variable at the end of a
heredoc */
+ efree(Z_UNIVAL(op2-u.constant).v);
+ return;
+ }
opline-op1 = *op1;
opline-op2 = *op2;
opline-op2.op_type = IS_CONST;
@@ -4154,33 +4154,6 @@
}
-void zend_do_end_heredoc(TSRMLS_D)
-{
- int opline_num = get_next_op_number(CG(active_op_array))-1;
- zend_op *opline = CG(active_op_array)-opcodes[opline_num];
-
- if (opline-opcode != ZEND_ADD_STRING) {
- return;
- }
-
- if (Z_TYPE(opline-op2.u.constant) == IS_UNICODE) {
-
Z_USTRVAL(opline-op2.u.constant)[(Z_USTRLEN(opline-op2.u.constant)--)-1] = 0;
- if (Z_USTRLEN(opline-op2.u.constant)0) {
- if
(Z_USTRVAL(opline-op2.u.constant)[Z_USTRLEN(opline-op2.u.constant)-1]=='\r') {
-
Z_USTRVAL(opline-op2.u.constant)[(Z_USTRLEN(opline-op2.u.constant)--)-1] = 0;
- }
- }
- } else {
-
Z_STRVAL(opline-op2.u.constant)[(Z_STRLEN(opline-op2.u.constant)--)-1] = 0;
- if (Z_STRLEN(opline-op2.u.constant)0) {
- if
(Z_STRVAL(opline-op2.u.constant)[Z_STRLEN(opline-op2.u.constant)-1]=='\r') {
-
Z_STRVAL(opline-op2.u.constant)[(Z_STRLEN(opline-op2.u.constant)--)-1] = 0;
- }
- }
- }
-}
-
-
void zend_do_exit(znode *result, znode *message TSRMLS_DC)
{
zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
@@ -4425,12 +4398,12 @@
{
int retval;
-again:
if (CG(increment_lineno)) {
CG(zend_lineno)++;
CG(increment_lineno) = 0;
}
+again:
Z_TYPE(zendlval-u.constant) = IS_LONG;
retval = lex_scan(zendlval-u.constant TSRMLS_CC);
switch (retval) {
@@ -4441,8 +4414,7 @@
goto again;
case T_CLOSE_TAG:
- if (LANG_SCNG(yy_text)[LANG_SCNG(yy_leng)-1]=='\n'
- ||
(LANG_SCNG(yy_text)[LANG_SCNG(yy_leng)-2]=='\r'
LANG_SCNG(yy_text)[LANG_SCNG(yy_leng)-1])) {
+ if (LANG_SCNG(yy_text)[LANG_SCNG(yy_leng)-1] != '') {
CG(increment_lineno) = 1;
}
retval = ';'; /* implicit ; */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.h?r1=1.356r2=1.357diff_format=u
Index: ZendEngine2/zend_compile.h
diff -u ZendEngine2/zend_compile.h:1.356 ZendEngine2/zend_compile.h:1.357
---
[PHP-CVS] cvs: php-src /ext/standard array.c
tony2001Fri May 18 14:11:12 2007 UTC
Modified files:
/php-src/ext/standard array.c
Log:
fix #41432 (extract() does not accept empty prefix)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.406r2=1.407diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.406 php-src/ext/standard/array.c:1.407
--- php-src/ext/standard/array.c:1.406 Sun Mar 18 20:23:51 2007
+++ php-src/ext/standard/array.cFri May 18 14:11:12 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.406 2007/03/18 20:23:51 wez Exp $ */
+/* $Id: array.c,v 1.407 2007/05/18 14:11:12 tony2001 Exp $ */
#include php.h
#include php_ini.h
@@ -1393,7 +1393,7 @@
if (prefix) {
convert_to_text(prefix);
- if (!php_valid_var_name(Z_UNIVAL_P(prefix), Z_UNILEN_P(prefix),
Z_TYPE_P(prefix))) {
+ if (Z_UNILEN_P(prefix)
!php_valid_var_name(Z_UNIVAL_P(prefix), Z_UNILEN_P(prefix), Z_TYPE_P(prefix))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, prefix is
not a valid identifier);
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
wez Fri May 18 15:50:49 2007 UTC Modified files: /CVSROOTavail Log: pecl karma for auroraeosrose for windows fixin http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1271r2=1.1272diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1271 CVSROOT/avail:1.1272 --- CVSROOT/avail:1.1271Wed May 16 21:53:38 2007 +++ CVSROOT/avail Fri May 18 15:50:49 2007 @@ -90,7 +90,7 @@ avail|dbs|peclweb # General pecl -avail|ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar|pecl +avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar|pecl # access to gcov.php.net website. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
tony2001Fri May 18 20:34:07 2007 UTC
Modified files:
/php-src/ext/standard file.c
Log:
fix leak and check for 0 only of the 5th arg was passed
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.488r2=1.489diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.488 php-src/ext/standard/file.c:1.489
--- php-src/ext/standard/file.c:1.488 Fri May 18 12:05:55 2007
+++ php-src/ext/standard/file.c Fri May 18 20:34:07 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.488 2007/05/18 12:05:55 tony2001 Exp $ */
+/* $Id: file.c,v 1.489 2007/05/18 20:34:07 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -554,6 +554,11 @@
return;
}
+ if (ZEND_NUM_ARGS() == 5 maxlen 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, length must be
greater than or equal to zero);
+ RETURN_FALSE;
+ }
+
context = php_stream_context_from_zval(zcontext, 0);
if (php_stream_path_param_encode(ppfilename, filename, filename_len,
REPORT_ERRORS, context) == FAILURE) {
RETURN_FALSE;
@@ -566,11 +571,6 @@
RETURN_FALSE;
}
- if (maxlen 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Length must be
greater than or equal to zero);
- RETURN_FALSE;
- }
-
if (offset 0 php_stream_seek(stream, offset, SEEK_SET) 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to seek to
position %ld in the stream, offset);
php_stream_close(stream);
--
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 file.c
tony2001Fri May 18 20:34:13 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard file.c
Log:
fix leak and check for 0 only of the 5th arg was passed
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.18r2=1.409.2.6.2.19diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.18
php-src/ext/standard/file.c:1.409.2.6.2.19
--- php-src/ext/standard/file.c:1.409.2.6.2.18 Fri May 18 12:06:44 2007
+++ php-src/ext/standard/file.c Fri May 18 20:34:13 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.18 2007/05/18 12:06:44 tony2001 Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.19 2007/05/18 20:34:13 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -536,6 +536,11 @@
return;
}
+ if (ZEND_NUM_ARGS() == 5 maxlen 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, length must be
greater than or equal to zero);
+ RETURN_FALSE;
+ }
+
context = php_stream_context_from_zval(zcontext, 0);
stream = php_stream_open_wrapper_ex(filename, rb,
@@ -545,11 +550,6 @@
RETURN_FALSE;
}
- if (maxlen 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Length must be
greater than or equal to zero);
- RETURN_FALSE;
- }
-
if (offset 0 php_stream_seek(stream, offset, SEEK_SET) 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to seek to
position %ld in the stream, offset);
php_stream_close(stream);
--
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
stasFri May 18 20:49:28 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: news about #41401 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.718r2=1.2027.2.547.2.719diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.718 php-src/NEWS:1.2027.2.547.2.719 --- php-src/NEWS:1.2027.2.547.2.718 Fri May 18 13:12:03 2007 +++ php-src/NEWSFri May 18 20:49:28 2007 @@ -60,6 +60,7 @@ - Fixed bug #41004 (minOccurs=0 and null class member variable). (Dmitry) - Fixed bug #39542 (Behaviour of require/include different to 5.2.0). (Dmitry) +- Fixed bug #41401 (wrong unary operator precedence) (Stas) 03 May 2007, PHP 5.2.2 - Improved bundled GD -- 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
tony2001Fri May 18 20:56:50 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: reorder http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.719r2=1.2027.2.547.2.720diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.719 php-src/NEWS:1.2027.2.547.2.720 --- php-src/NEWS:1.2027.2.547.2.719 Fri May 18 20:49:28 2007 +++ php-src/NEWSFri May 18 20:56:50 2007 @@ -24,6 +24,7 @@ (Tony, Dmitry) - Fixed bug #41403 (json_decode cannot decode floats if localeconv decimal_point is not '.'). (Tony) +- Fixed bug #41401 (wrong unary operator precedence). (Stas) - Fixed bug #41394 (dbase_create creates file with corrupted header). (Tony) - Fixed bug #41390 (Clarify error message with invalid protocol scheme). (Scott) @@ -60,7 +61,6 @@ - Fixed bug #41004 (minOccurs=0 and null class member variable). (Dmitry) - Fixed bug #39542 (Behaviour of require/include different to 5.2.0). (Dmitry) -- Fixed bug #41401 (wrong unary operator precedence) (Stas) 03 May 2007, PHP 5.2.2 - Improved bundled GD -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
