[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed May 30 01:31:06 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2703r2=1.2704diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2703 php-src/ChangeLog:1.2704 --- php-src/ChangeLog:1.2703Tue May 29 01:31:11 2007 +++ php-src/ChangeLog Wed May 30 01:31:05 2007 @@ -1,3 +1,117 @@ +2007-05-29 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/dl.c: + more typofixes + +2007-05-29 Ilia Alshanetsky [EMAIL PROTECTED] + +* ZendEngine2/tests/foreach.phpt + ext/filter/logical_filters.c + ext/filter/tests/PMOPB45.phpt + ext/imap/tests/bug40854.phpt + ext/pgsql/pgsql.c + ext/standard/dir.c + ext/standard/dl.c + ext/standard/mail.c + ext/standard/user_filters.c + ext/standard/tests/array/bug40709.phpt + ext/standard/tests/strings/bug40432.phpt + ext/standard/tests/strings/bug40704.phpt + ext/standard/tests/strings/bug40754.phpt + ext/standard/tests/strings/htmlentities18.phpt + ext/sybase/php_sybase_db.c + ext/tidy/tests/024.phpt + ext/wddx/tests/bug41283.phpt + ext/xmlrpc/libxmlrpc/base64.c + ext/xmlrpc/libxmlrpc/base64.h + main/streams/transports.c + sapi/cgi/cgi_main.c: + + MFB + +2007-05-29 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/file.c: + fix #41516 (fgets() returns a line of text when length parameter is = 0) + +* ext/standard/user_filters.c: + fix typo build + +2007-05-29 Stanislav Malyshev [EMAIL PROTECTED] + +* win32/build/config.w32: + fix build on msvc 8 + +2007-05-29 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt + ext/standard/tests/general_functions/intval.phpt + ext/standard/tests/general_functions/is_float.phpt + ext/standard/tests/general_functions/is_float_64bit.phpt + ext/standard/tests/general_functions/is_int.phpt + ext/standard/tests/general_functions/is_int_64bit.phpt + ext/standard/tests/general_functions/print_r_64bit.phpt + ext/standard/tests/general_functions/var_dump_64bit.phpt: + fix tests, add 64bit versions + +2007-05-29 Michael Wallner [EMAIL PROTECTED] + +* ext/mhash/config.m4 + ext/mhash/mhash.c: + - fix build where mhash.h is not declaring +mhash_get_hash_name_static and/or +mhash_get_keygen_name_static protos + +2007-05-29 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/tests/array/002.phpt + ext/standard/tests/array/005.phpt + ext/standard/tests/array/009.phpt + ext/standard/tests/array/array_change_key_case.phpt + ext/standard/tests/array/array_keys.phpt + ext/standard/tests/array/array_map.phpt + ext/standard/tests/array/array_pop.phpt + ext/standard/tests/array/array_search.phpt + ext/standard/tests/array/each.phpt: + fix tests in unicode mode + +* ZendEngine2/tests/compare_001_64bit.phpt + ZendEngine2/tests/compare_002_64bit.phpt + ZendEngine2/tests/compare_003_64bit.phpt + ZendEngine2/tests/compare_004_64bit.phpt + ZendEngine2/tests/compare_005_64bit.phpt + ZendEngine2/tests/compare_006_64bit.phpt + ext/standard/tests/file/bug38450.phpt + ext/standard/tests/file/bug38450_1.phpt + ext/standard/tests/file/filetype_variation.phpt + ext/standard/tests/general_functions/debug_zval_dump_o.phpt + ext/standard/tests/general_functions/debug_zval_dump_v.phpt + ext/standard/tests/general_functions/strval.phpt + ext/standard/tests/general_functions/var_export.phpt + ext/standard/tests/general_functions/var_export.phpt + ext/standard/tests/strings/explode1.phpt + ext/standard/tests/strings/explode1.phpt: + fix tests + +* ZendEngine2/tests/019.phpt + ext/json/tests/fail001.phpt + ext/mysql/tests/mysql_affected_rows.phpt + ext/standard/tests/array/bug29253.phpt + tests/classes/array_access_010.phpt: + fix test + +2007-05-29 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/reflection/php_reflection.c: + - Bug #41525 ReflectionParameter::getPosition() not available + +2007-05-29 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/md5.c: + fix typo + 2007-05-28 Ilia Alshanetsky [EMAIL PROTECTED] * run-tests.php
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed May 30 01:31:09 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1120r2=1.1121diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1120 ZendEngine2/ChangeLog:1.1121 --- ZendEngine2/ChangeLog:1.1120Tue May 29 01:31:14 2007 +++ ZendEngine2/ChangeLog Wed May 30 01:31:09 2007 @@ -1,3 +1,22 @@ +2007-05-29 Ilia Alshanetsky [EMAIL PROTECTED] + +* tests/foreach.phpt: + + MFB + +2007-05-29 Antony Dovgal [EMAIL PROTECTED] + +* tests/compare_001_64bit.phpt + tests/compare_002_64bit.phpt + tests/compare_003_64bit.phpt + tests/compare_004_64bit.phpt + tests/compare_005_64bit.phpt + tests/compare_006_64bit.phpt: + fix tests + +* tests/019.phpt: + fix test + 2007-05-28 Antony Dovgal [EMAIL PROTECTED] * zend_API.c @@ -17966,7 +17985,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1120 2007/05/29 01:31:14 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1121 2007/05/30 01:31:09 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -19690,7 +19709,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1120 2007/05/29 01:31:14 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1121 2007/05/30 01:31:09 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/standard md5.c
tony2001Tue May 29 08:01:23 2007 UTC
Modified files:
/php-src/ext/standard md5.c
Log:
fix typo
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/md5.c?r1=1.50r2=1.51diff_format=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.50 php-src/ext/standard/md5.c:1.51
--- php-src/ext/standard/md5.c:1.50 Mon May 28 23:14:57 2007
+++ php-src/ext/standard/md5.c Tue May 29 08:01:23 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: md5.c,v 1.50 2007/05/28 23:14:57 iliaa Exp $ */
+/* $Id: md5.c,v 1.51 2007/05/29 08:01:23 tony2001 Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
@@ -75,7 +75,7 @@
if (raw_output) {
RETVAL_STRINGL((char*)digest, 16, 1);
} else {
- make_digest_ex(md5str, digest. 16);
+ make_digest_ex(md5str, digest, 16);
RETVAL_ASCII_STRING(md5str, ZSTR_DUPLICATE);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mhash mhash.c php_mhash.h
Antony Dovgal wrote: On 15.11.2006 20:16, Michael Wallner wrote: mikeWed Nov 15 17:16:05 2006 UTC Modified files: /php-src/ext/mhashmhash.c php_mhash.h Log: - unicode upgrade - use current parameter parsing API ...just adding [DOC] tracker for the following: - added keygen constants - Added keygen functions: mhash_keygen_count, mhash_get_keygen_name, mhash_keygen_uses_hash, mhash_keygen_uses_salt, mhash_get_keygen_salt_size, mhash_keygen This patch breaks the build: /local/qa/head/ext/mhash/mhash.c:68: error: conflicting types for 'mhash_get_hash_name_static' /usr/include/mutils/mhash.h:57: error: previous declaration of 'mhash_get_hash_name_static' was here The function is declared in the header like this: __const mutils_word8 *mhash_get_hash_name_static(hashid type); Looks like there are headers without *and* with _different_ declarations. I'll add a header grep to the config.m4 -- thanks! -- Michael -- 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/general_functions var_export.phpt /ext/standard/tests/strings explode1.phpt
tony2001Tue May 29 10:25:21 2007 UTC Modified files: /php-src/ext/standard/tests/general_functions var_export.phpt /php-src/ext/standard/tests/strings explode1.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/var_export.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/general_functions/var_export.phpt diff -u php-src/ext/standard/tests/general_functions/var_export.phpt:1.2 php-src/ext/standard/tests/general_functions/var_export.phpt:1.3 --- php-src/ext/standard/tests/general_functions/var_export.phpt:1.2Fri May 25 13:50:06 2007 +++ php-src/ext/standard/tests/general_functions/var_export.phptTue May 29 10:25:21 2007 @@ -1,5 +1,7 @@ --TEST-- Test var_export() function +--INI-- +precision=14 --FILE-- ?php /* Prototype: mixed var_export( mixed expression [, bool return]); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode1.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/explode1.phpt diff -u php-src/ext/standard/tests/strings/explode1.phpt:1.2 php-src/ext/standard/tests/strings/explode1.phpt:1.3 --- php-src/ext/standard/tests/strings/explode1.phpt:1.2Fri May 25 13:50:06 2007 +++ php-src/ext/standard/tests/strings/explode1.phptTue May 29 10:25:21 2007 @@ -2,6 +2,7 @@ Test explode() function --INI-- error_reporting=2047 +precision=14 --FILE-- ?php /* Prototype: array explode ( string $delimiter, string $string [, int $limit] ); -- 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/general_functions var_export.phpt /ext/standard/tests/strings explode1.phpt
tony2001Tue May 29 10:25:33 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions var_export.phpt /php-src/ext/standard/tests/strings explode1.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/var_export.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/general_functions/var_export.phpt diff -u php-src/ext/standard/tests/general_functions/var_export.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/var_export.phpt:1.1.2.2 --- php-src/ext/standard/tests/general_functions/var_export.phpt:1.1.2.1 Fri May 25 13:44:23 2007 +++ php-src/ext/standard/tests/general_functions/var_export.phptTue May 29 10:25:33 2007 @@ -1,5 +1,7 @@ --TEST-- Test var_export() function +--INI-- +precision=14 --FILE-- ?php /* Prototype: mixed var_export( mixed expression [, bool return]); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/strings/explode1.phpt diff -u php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.1 php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.1Fri May 25 13:44:23 2007 +++ php-src/ext/standard/tests/strings/explode1.phptTue May 29 10:25:33 2007 @@ -2,6 +2,7 @@ Test explode() function --INI-- error_reporting=2047 +precision=14 --FILE-- ?php /* Prototype: array explode ( string $delimiter, string $string [, int $limit] ); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes array_access_010.phpt
tony2001Tue May 29 11:34:58 2007 UTC
Modified files:
/php-src/tests/classes array_access_010.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/array_access_010.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/tests/classes/array_access_010.phpt
diff -u php-src/tests/classes/array_access_010.phpt:1.3
php-src/tests/classes/array_access_010.phpt:1.4
--- php-src/tests/classes/array_access_010.phpt:1.3 Mon Aug 15 14:37:54 2005
+++ php-src/tests/classes/array_access_010.phpt Tue May 29 11:34:58 2007
@@ -102,6 +102,8 @@
string(6) FooBar
string(9) FooBarBaz
===ArrayOverloading===
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
object(ArrayReferenceProxy)#1 (2) {
[object:ArrayReferenceProxy:private]=
@@ -121,27 +123,63 @@
string(3) Foo
}
}
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetGet(Array, name)
string(3) Foo
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetSet(Array, name, FooBar)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetGet(Array, name)
string(6) FooBar
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetSet(Array, name, FooBarBar)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetGet(Array, name)
string(9) FooBarBar
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetGet(Array, name)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetSet(Array, name, FooBarBarBaz)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetGet(Array, name)
string(12) FooBarBarBaz
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetUnset(Array, name)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
object(ArrayReferenceProxy)#1 (2) {
[object:ArrayReferenceProxy:private]=
@@ -157,12 +195,24 @@
array(0) {
}
}
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetGet(Array, name)
NULL
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetSet(Array, name, BlaBla)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetGet(Array, name)
string(6) BlaBla
===DONE===
@@ -171,6 +221,8 @@
unicode(6) FooBar
unicode(9) FooBarBaz
===ArrayOverloading===
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
object(ArrayReferenceProxy)#1 (2) {
[uobject:uArrayReferenceProxy:private]=
@@ -190,27 +242,63 @@
unicode(3) Foo
}
}
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetGet(Array, name)
unicode(3) Foo
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetSet(Array, name, FooBar)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetGet(Array, name)
unicode(6) FooBar
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetSet(Array, name, FooBarBar)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::offsetGet(Array, name)
unicode(9) FooBarBar
+
+Notice: Array to string conversion in %s on line %d
ArrayReferenceProxy::__construct(Array)
+
+Notice: Array to
[PHP-CVS] cvs: php-src /ext/json/tests fail001.phpt
tony2001Tue May 29 11:58:55 2007 UTC
Modified files:
/php-src/ext/json/tests fail001.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/fail001.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/json/tests/fail001.phpt
diff -u php-src/ext/json/tests/fail001.phpt:1.4
php-src/ext/json/tests/fail001.phpt:1.5
--- php-src/ext/json/tests/fail001.phpt:1.4 Fri May 25 12:31:35 2007
+++ php-src/ext/json/tests/fail001.phpt Tue May 29 11:58:55 2007
@@ -249,11 +249,11 @@
unicode(34) [Illegal backslash escape: \017]
AS ARRAY
unicode(34) [Illegal backslash escape: \017]
-Testing: Too deep
+Testing:
Too
deep
AS OBJECT
-unicode(50) Too deep
+unicode(266)
Too
deep
AS ARRAY
-unicode(50) Too deep
+unicode(266)
Too
deep
Testing: {Missing colon null}
AS OBJECT
unicode(22) {Missing colon null}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_affected_rows.phpt
tony2001Tue May 29 12:01:14 2007 UTC
Modified files:
/php-src/ext/mysql/testsmysql_affected_rows.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_affected_rows.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mysql/tests/mysql_affected_rows.phpt
diff -u php-src/ext/mysql/tests/mysql_affected_rows.phpt:1.1
php-src/ext/mysql/tests/mysql_affected_rows.phpt:1.2
--- php-src/ext/mysql/tests/mysql_affected_rows.phpt:1.1Sun Nov 19
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_affected_rows.phptTue May 29 12:01:14 2007
@@ -1,7 +1,7 @@
--TEST--
mysql_affected_rows()
--SKIPIF--
-?php // require_once('skipif.inc'); ?
+?php require_once('skipif.inc'); ?
--FILE--
?php
include connect.inc;
@@ -111,4 +111,4 @@
print done!;
?
--EXPECTF--
-done!
\ No newline at end of file
+done!
--
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/array 002.phpt 005.phpt 009.phpt array_change_key_case.phpt array_keys.phpt array_map.phpt array_pop.phpt array_search.phpt each.phpt
tony2001Tue May 29 12:10:20 2007 UTC
Modified files:
/php-src/ext/standard/tests/array 002.phpt 005.phpt 009.phpt
array_change_key_case.phpt
array_keys.phpt array_map.phpt
array_pop.phpt array_search.phpt
each.phpt
Log:
fix tests in unicode mode
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/002.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/standard/tests/array/002.phpt
diff -u php-src/ext/standard/tests/array/002.phpt:1.7
php-src/ext/standard/tests/array/002.phpt:1.8
--- php-src/ext/standard/tests/array/002.phpt:1.7 Mon Aug 15 14:37:55 2005
+++ php-src/ext/standard/tests/array/002.phpt Tue May 29 12:10:20 2007
@@ -29,7 +29,7 @@
}
?
---EXPECT--
+--EXPECTF--
Unsorted data:
array(8) {
[0]=
@@ -129,6 +129,16 @@
float(-0.33)
}
Using SORT_STRING
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
array(8) {
[1000]=
string(4) test
@@ -227,6 +237,16 @@
int(27)
}
Using SORT_STRING
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
array(8) {
[16777216]=
float(-0.33)
@@ -521,6 +541,16 @@
float(-0.33)
}
Using SORT_STRING
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
array(8) {
[0]=
string(4) test
@@ -619,6 +649,16 @@
int(27)
}
Using SORT_STRING
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
array(8) {
[0]=
float(-0.33)
@@ -642,7 +682,7 @@
[7]=
string(4) test
}
---UEXPECT--
+--UEXPECTF--
Unsorted data:
array(8) {
[0]=
@@ -742,6 +782,16 @@
float(-0.33)
}
Using SORT_STRING
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
array(8) {
[1000]=
unicode(4) test
@@ -840,6 +890,16 @@
int(27)
}
Using SORT_STRING
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
array(8) {
[16777216]=
float(-0.33)
@@ -1134,6 +1194,16 @@
float(-0.33)
}
Using SORT_STRING
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
array(8) {
[0]=
unicode(4) test
@@ -1232,6 +1302,16 @@
int(27)
}
Using SORT_STRING
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
array(8) {
[0]=
float(-0.33)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/005.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/tests/array/005.phpt
diff -u php-src/ext/standard/tests/array/005.phpt:1.4
php-src/ext/standard/tests/array/005.phpt:1.5
--- php-src/ext/standard/tests/array/005.phpt:1.4 Sat May 12 11:20:52 2007
+++ php-src/ext/standard/tests/array/005.phpt Tue May 29 12:10:20 2007
@@ -289,3 +289,211 @@
Current Element after shift operation is: int(2)
Done
+--UEXPECTF--
+*** Testing Error Conditions ***
+
+Warning: array_shift() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: array_shift() expects parameter 1 to be array, integer given in %s on
line %d
+NULL
+
+Warning: array_shift() expects parameter 1 to be array, Unicode string given
in %s on line %d
+NULL
+
+Warning: array_shift() expects exactly 1
[PHP-CVS] cvs: php-src /ext/standard/tests/array bug29253.phpt
tony2001Tue May 29 12:17:37 2007 UTC
Modified files:
/php-src/ext/standard/tests/array bug29253.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug29253.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/tests/array/bug29253.phpt
diff -u php-src/ext/standard/tests/array/bug29253.phpt:1.4
php-src/ext/standard/tests/array/bug29253.phpt:1.5
--- php-src/ext/standard/tests/array/bug29253.phpt:1.4 Mon May 7 17:23:04 2007
+++ php-src/ext/standard/tests/array/bug29253.phpt Tue May 29 12:17:37 2007
@@ -7,11 +7,73 @@
var_dump(array_diff_assoc($GLOBALS, $zz));
var_dump($gg);
?
---EXPECT--
+--EXPECTF--
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
array(0) {
}
string(4) afad
---UEXPECT--
+--UEXPECTF--
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
array(0) {
}
unicode(4) afad
--
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/general_functions debug_zval_dump_o.phpt debug_zval_dump_v.phpt strval.phpt
tony2001Tue May 29 12:26:59 2007 UTC
Modified files:
/php-src/ext/standard/tests/general_functions
debug_zval_dump_o.phpt
debug_zval_dump_v.phpt
strval.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
diff -u php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt:1.2
php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt:1.3
--- php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt:1.2
Sat May 12 12:18:13 2007
+++ php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt Tue May
29 12:26:59 2007
@@ -837,3 +837,727 @@
}
}
Done
+--UEXPECTF--
+*** Testing debug_zval_dump() on objects ***
+-- Iteration 1 --
+object(object_class)#%d (6) refcount(4){
+ [uvalue1]=
+ long(5) refcount(1)
+ [uvalue2:uobject_class:private]=
+ long(10) refcount(5)
+ [uvalue3:protected]=
+ long(20) refcount(5)
+ [uvalue4]=
+ long(30) refcount(6)
+ [uarray_var]=
+ array(2) refcount(5){
+[ukey1 { 006b 0065 0079 0031 }]=
+long(1) refcount(1)
+[ukey2 { 006b 0065 0079 0032 0020 }]=
+long(3) refcount(1)
+ }
+ [uobject_class1]=
+ object(object_class)#%d (6) refcount(4){
+[uvalue1]=
+long(5) refcount(1)
+[uvalue2:uobject_class:private]=
+long(10) refcount(5)
+[uvalue3:protected]=
+long(20) refcount(5)
+[uvalue4]=
+long(30) refcount(6)
+[uarray_var]=
+array(2) refcount(5){
+ [ukey1 { 006b 0065 0079 0031 }]=
+ long(1) refcount(1)
+ [ukey2 { 006b 0065 0079 0032 0020 }]=
+ long(3) refcount(1)
+}
+[uobject_class1]=
+*RECURSION*
+ }
+}
+-- Iteration 2 --
+object(no_member_class)#%d (0) refcount(3){
+}
+-- Iteration 3 --
+object(contains_object_class)#%d (9) refcount(3){
+ [up]=
+ long(30) refcount(2)
+ [up1:protected]=
+ long(40) refcount(2)
+ [up2:ucontains_object_class:private]=
+ long(50) refcount(2)
+ [uclass_object1]=
+ object(object_class)#%d (6) refcount(5){
+[uvalue1]=
+long(5) refcount(1)
+[uvalue2:uobject_class:private]=
+long(10) refcount(5)
+[uvalue3:protected]=
+long(20) refcount(5)
+[uvalue4]=
+long(30) refcount(6)
+[uarray_var]=
+array(2) refcount(5){
+ [ukey1 { 006b 0065 0079 0031 }]=
+ long(1) refcount(1)
+ [ukey2 { 006b 0065 0079 0032 0020 }]=
+ long(3) refcount(1)
+}
+[uobject_class1]=
+object(object_class)#%d (6) refcount(5){
+ [uvalue1]=
+ long(5) refcount(1)
+ [uvalue2:uobject_class:private]=
+ long(10) refcount(5)
+ [uvalue3:protected]=
+ long(20) refcount(5)
+ [uvalue4]=
+ long(30) refcount(6)
+ [uarray_var]=
+ array(2) refcount(5){
+[ukey1 { 006b 0065 0079 0031 }]=
+long(1) refcount(1)
+[ukey2 { 006b 0065 0079 0032 0020 }]=
+long(3) refcount(1)
+ }
+ [uobject_class1]=
+ *RECURSION*
+}
+ }
+ [uclass_object2]=
+ object(object_class)#%d (6) refcount(5){
+[uvalue1]=
+long(5) refcount(1)
+[uvalue2:uobject_class:private]=
+long(10) refcount(5)
+[uvalue3:protected]=
+long(20) refcount(5)
+[uvalue4]=
+long(30) refcount(6)
+[uarray_var]=
+array(2) refcount(5){
+ [ukey1 { 006b 0065 0079 0031 }]=
+ long(1) refcount(1)
+ [ukey2 { 006b 0065 0079 0032 0020 }]=
+ long(3) refcount(1)
+}
+[uobject_class1]=
+object(object_class)#%d (6) refcount(5){
+ [uvalue1]=
+ long(5) refcount(1)
+ [uvalue2:uobject_class:private]=
+ long(10) refcount(5)
+ [uvalue3:protected]=
+ long(20) refcount(5)
+ [uvalue4]=
+ long(30) refcount(6)
+ [uarray_var]=
+ array(2) refcount(5){
+[ukey1 { 006b 0065 0079 0031 }]=
+long(1) refcount(1)
+[ukey2 { 006b 0065 0079 0032 0020 }]=
+long(3) refcount(1)
+ }
+ [uobject_class1]=
+ *RECURSION*
+}
+ }
+ [uclass_object3:ucontains_object_class:private]=
+ object(object_class)#%d (6) refcount(5){
+[uvalue1]=
+long(5) refcount(1)
+[uvalue2:uobject_class:private]=
+long(10) refcount(5)
+[uvalue3:protected]=
+long(20) refcount(5)
+[uvalue4]=
+long(30) refcount(6)
+[uarray_var]=
+array(2) refcount(5){
+ [ukey1 { 006b 0065 0079 0031 }]=
+ long(1) refcount(1)
+ [ukey2 { 006b 0065 0079 0032 0020 }]=
+ long(3) refcount(1)
+}
+[uobject_class1]=
+object(object_class)#%d (6) refcount(5){
+ [uvalue1]=
+ long(5) refcount(1)
+ [uvalue2:uobject_class:private]=
+ long(10) refcount(5)
+ [uvalue3:protected]=
+ long(20) refcount(5)
+
[PHP-CVS] cvs: php-src /ext/mhash config.m4 mhash.c
mikeTue May 29 12:28:57 2007 UTC
Modified files:
/php-src/ext/mhash config.m4 mhash.c
Log:
- fix build where mhash.h is not declaring
mhash_get_hash_name_static and/or
mhash_get_keygen_name_static protos
http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/config.m4?r1=1.16r2=1.17diff_format=u
Index: php-src/ext/mhash/config.m4
diff -u php-src/ext/mhash/config.m4:1.16 php-src/ext/mhash/config.m4:1.17
--- php-src/ext/mhash/config.m4:1.16Sat Dec 23 18:00:49 2006
+++ php-src/ext/mhash/config.m4 Tue May 29 12:28:57 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.16 2006/12/23 18:00:49 derick Exp $
+dnl $Id: config.m4,v 1.17 2007/05/29 12:28:57 mike Exp $
dnl
PHP_ARG_WITH(mhash, for mhash support,
@@ -13,6 +13,20 @@
if test -z $MHASH_DIR; then
AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h)
fi
+
+ PHP_MHASH_MISSING_PROTOS=
+ AC_MSG_CHECKING(for missing protos)
+ AC_EGREP_HEADER(mhash_get_hash_name_static, [$MHASH_DIR/include/mhash.h], [
+AC_DEFINE([HAVE_MHASH_GET_HASH_NAME_STATIC_PROTO], 1, [ ])
+ ], [
+PHP_MHASH_MISSING_PROTOS=mhash_get_hash_name_static
+ ])
+ AC_EGREP_HEADER(mhash_get_keygen_name_static, [$MHASH_DIR/include/mhash.h], [
+AC_DEFINE([HAVE_MHASH_GET_KEYGEN_NAME_STATIC_PROTO], 1, [ ])
+ ], [
+PHP_MHASH_MISSING_PROTOS=mhash_get_keygen_name_static
$PHP_MHASH_MISSING_PROTOS
+ ])
+ AC_MSG_RESULT([$PHP_MHASH_MISSING_PROTOS])
PHP_ADD_INCLUDE($MHASH_DIR/include)
PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/$PHP_LIBDIR, MHASH_SHARED_LIBADD)
http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/mhash.c?r1=1.57r2=1.58diff_format=u
Index: php-src/ext/mhash/mhash.c
diff -u php-src/ext/mhash/mhash.c:1.57 php-src/ext/mhash/mhash.c:1.58
--- php-src/ext/mhash/mhash.c:1.57 Mon Jan 1 09:29:25 2007
+++ php-src/ext/mhash/mhash.c Tue May 29 12:28:57 2007
@@ -16,7 +16,7 @@
| Nikos Mavroyanopoulos [EMAIL PROTECTED] (HMAC, KEYGEN) |
+--+
*/
-/* $Id: mhash.c,v 1.57 2007/01/01 09:29:25 sebastian Exp $ */
+/* $Id: mhash.c,v 1.58 2007/05/29 12:28:57 mike Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -65,8 +65,12 @@
#define NO_ARGS() (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
))
+#ifndef HAVE_MHASH_GET_HASH_NAME_STATIC_PROTO
extern const char *mhash_get_hash_name_static(hashid hash);
+#endif
+#ifndef HAVE_MHASH_GET_KEYGEN_NAME_STATIC_PROTO
extern const char *mhash_get_keygen_name_static(hashid type);
+#endif
/* {{{ int php_mhash */
int php_mhash(hashid hash, const char *input_str, int input_len, const char
*key_str, int key_len, char **enc, int *len TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
stasTue May 29 19:44:24 2007 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
fix build on msvc 8
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.66r2=1.67diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.66 php-src/win32/build/config.w32:1.67
--- php-src/win32/build/config.w32:1.66 Wed Apr 18 09:48:07 2007
+++ php-src/win32/build/config.w32 Tue May 29 19:44:24 2007
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.66 2007/04/18 09:48:07 rrichards Exp $
+// $Id: config.w32,v 1.67 2007/05/29 19:44:24 stas Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -126,7 +126,7 @@
if (X64) {
ADD_FLAG('CFLAGS', ' /wd4996 /Wp64 ');
} else {
- ADD_FLAG('CFLAGS', ' /wd4996 ');
+ ADD_FLAG('CFLAGS', ' /wd4996 /D_USE_32BIT_TIME_T=1 ');
}
if (PHP_DEBUG == yes) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard user_filters.c
tony2001Tue May 29 20:31:22 2007 UTC
Modified files:
/php-src/ext/standard user_filters.c
Log:
fix typo build
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.46r2=1.47diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.46
php-src/ext/standard/user_filters.c:1.47
--- php-src/ext/standard/user_filters.c:1.46Tue May 29 20:11:23 2007
+++ php-src/ext/standard/user_filters.c Tue May 29 20:31:22 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: user_filters.c,v 1.46 2007/05/29 20:11:23 iliaa Exp $ */
+/* $Id: user_filters.c,v 1.47 2007/05/29 20:31:22 tony2001 Exp $ */
#include php.h
#include php_globals.h
@@ -284,7 +284,7 @@
char *wildcard = emalloc(len + 3);
/* Search for wildcard matches instead */
- memcpy(wildname, filtername, len + 1); /* copy \0 */
+ memcpy(wildcard, filtername, len + 1); /* copy \0 */
period = wildcard + (period - filtername);
while (period) {
*period = '\0';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c mail.c user_filters.c /ext/standard/tests/array bug40709.phpt /ext/standard/tests/strings bug40432.phpt bug40704.phpt bug40754.phpt htmlentities18.phpt /e
iliaa Tue May 29 20:11:23 2007 UTC
Modified files:
/php-src/ext/standard user_filters.c mail.c dir.c
/php-src/ext/standard/tests/array bug40709.phpt
/php-src/ext/standard/tests/strings bug40432.phpt bug40704.phpt
bug40754.phpt
htmlentities18.phpt
/php-src/ext/wddx/tests bug41283.phpt
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.45r2=1.46diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.45
php-src/ext/standard/user_filters.c:1.46
--- php-src/ext/standard/user_filters.c:1.45Thu Feb 1 14:20:53 2007
+++ php-src/ext/standard/user_filters.c Tue May 29 20:11:23 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: user_filters.c,v 1.45 2007/02/01 14:20:53 tony2001 Exp $ */
+/* $Id: user_filters.c,v 1.46 2007/05/29 20:11:23 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -260,6 +260,7 @@
zval *obj, *zfilter;
zval func_name;
zval *retval = NULL;
+ int len;
/* some sanity checks */
if (persistent) {
@@ -268,9 +269,10 @@
return NULL;
}
+ len = strlen(filtername);
+
/* determine the classname/class entry */
- if (FAILURE == zend_hash_find(BG(user_filter_map), (char*)filtername,
- strlen(filtername) + 1, (void**)fdat)) {
+ if (FAILURE == zend_hash_find(BG(user_filter_map), (char*)filtername,
len + 1, (void**)fdat)) {
char *period;
/* Userspace Filters using ambiguous wildcards could cause
problems.
@@ -279,10 +281,10 @@
TODO: Allow failed userfilter creations to continue
scanning through the list */
if ((period = strrchr(filtername, '.'))) {
- char *wildcard;
+ char *wildcard = emalloc(len + 3);
/* Search for wildcard matches instead */
- wildcard = estrdup(filtername);
+ memcpy(wildname, filtername, len + 1); /* copy \0 */
period = wildcard + (period - filtername);
while (period) {
*period = '\0';
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.91r2=1.92diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.91 php-src/ext/standard/mail.c:1.92
--- php-src/ext/standard/mail.c:1.91Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/mail.c Tue May 29 20:11:23 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.91 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: mail.c,v 1.92 2007/05/29 20:11:23 iliaa Exp $ */
#include stdlib.h
#include ctype.h
@@ -47,8 +47,8 @@
#define SKIP_LONG_HEADER_SEP(str, pos)
\
if (str[pos] == '\r' str[pos + 1] == '\n' (str[pos + 2] == ' ' ||
str[pos + 2] == '\t')) {\
- pos += 3;
\
- while (str[pos] == ' ' || str[pos] == '\t') {
\
+ pos += 2;
\
+ while (str[pos + 1] == ' ' || str[pos + 1] == '\t') {
\
pos++;
\
}
\
continue;
\
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.160r2=1.161diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.160 php-src/ext/standard/dir.c:1.161
--- php-src/ext/standard/dir.c:1.160Mon Jan 22 09:32:55 2007
+++ php-src/ext/standard/dir.c Tue May 29 20:11:23 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.160 2007/01/22 09:32:55 dmitry Exp $ */
+/* $Id: dir.c,v 1.161 2007/05/29 20:11:23 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -449,7 +449,7 @@
/* we assume that any glob pattern will match files from one directory
only
so checking the dirname of the first match should be sufficient */
- strncpy(cwd, globbuf.gl_pathv[0], MAXPATHLEN);
+ strlcpy(cwd, globbuf.gl_pathv[0], MAXPATHLEN);
if
[PHP-CVS] cvs: php-src /ext/standard file.c
tony2001Tue May 29 20:48:38 2007 UTC
Modified files:
/php-src/ext/standard file.c
Log:
fix #41516 (fgets() returns a line of text when length parameter is = 0)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.489r2=1.490diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.489 php-src/ext/standard/file.c:1.490
--- php-src/ext/standard/file.c:1.489 Fri May 18 20:34:07 2007
+++ php-src/ext/standard/file.c Tue May 29 20:48:38 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.489 2007/05/18 20:34:07 tony2001 Exp $ */
+/* $Id: file.c,v 1.490 2007/05/29 20:48:38 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1138,6 +1138,11 @@
RETURN_NULL();
}
+ if (length = 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Length parameter
must be greater than 0);
+ RETURN_FALSE;
+ }
+
if (length == 1) {
/* For BC reasons, fgets() should only return length-1 bytes. */
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dl.c
tony2001Tue May 29 21:24:45 2007 UTC
Modified files:
/php-src/ext/standard dl.c
Log:
more typofixes
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.113r2=1.114diff_format=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.113 php-src/ext/standard/dl.c:1.114
--- php-src/ext/standard/dl.c:1.113 Tue May 29 21:06:04 2007
+++ php-src/ext/standard/dl.c Tue May 29 21:24:45 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.113 2007/05/29 21:06:04 iliaa Exp $ */
+/* $Id: dl.c,v 1.114 2007/05/29 21:24:45 tony2001 Exp $ */
#include php.h
#include dl.h
@@ -116,9 +116,9 @@
int extension_dir_len = strlen(extension_dir);
if (IS_SLASH(extension_dir[extension_dir_len-1])) {
- spprintf(libpath, 0, %s%s, extension_dir, filename);
/* SAFE */
+ spprintf(libpath, 0, %s%s, extension_dir, filename);
/* SAFE */
} else {
- spprintf(libpath, 0, %s%c%s, extension_dir,
DEFAULT_SLASH, filename); /* SAFE */
+ spprintf(libpath, 0, %s%c%s, extension_dir,
DEFAULT_SLASH, filename); /* SAFE */
}
} else {
libpath = estrndup(filename, filename_len);
--
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 string.c /ext/standard/tests/strings chunk_split.phpt
iliaa Wed May 30 00:33:14 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/standard/tests/strings chunk_split.phpt
/php-src/ext/standard string.c
Log:
Fixed an interger overflow inside chunk_split(), identified by Gerhard
Wagner
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.744r2=1.2027.2.547.2.745diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.744 php-src/NEWS:1.2027.2.547.2.745
--- php-src/NEWS:1.2027.2.547.2.744 Tue May 29 08:44:05 2007
+++ php-src/NEWSWed May 30 00:33:13 2007
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? Jun 2007, PHP 5.2.3
+- Fixed an interger overflow inside chunk_split(), identified by Gerhard
+ Wagner (Ilia)
- Fixed bug #41525 (ReflectionParameter::getPosition() not available). (Marcus)
- Fixed bug #41511 (Compile failure under IRIX 6.5.30 building md5.c). (Jani)
- Fixed bug #41504 (json_decode() incorrectly decodes JSON arrays with empty
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chunk_split.phpt?r1=1.3r2=1.3.4.1diff_format=u
Index: php-src/ext/standard/tests/strings/chunk_split.phpt
diff -u php-src/ext/standard/tests/strings/chunk_split.phpt:1.3
php-src/ext/standard/tests/strings/chunk_split.phpt:1.3.4.1
--- php-src/ext/standard/tests/strings/chunk_split.phpt:1.3 Sun Apr 3
18:08:40 2005
+++ php-src/ext/standard/tests/strings/chunk_split.phpt Wed May 30 00:33:13 2007
@@ -6,6 +6,12 @@
echo chunk_split('f', 5).\n;
echo chunk_split(str_repeat('X', 2*76)).\n;
echo chunk_split(test, 10, |end) . \n;
+
+$a=str_repeat(B, 65535);
+$b=1;
+$c=str_repeat(B, 65535);
+var_dump(chunk_split($a,$b,$c));
+
?
--EXPECT--
a-b-c-
@@ -18,3 +24,4 @@
test|end
+bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.57r2=1.445.2.14.2.58diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.57
php-src/ext/standard/string.c:1.445.2.14.2.58
--- php-src/ext/standard/string.c:1.445.2.14.2.57 Thu May 24 21:29:27 2007
+++ php-src/ext/standard/string.c Wed May 30 00:33:13 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.57 2007/05/24 21:29:27 rasmus Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.58 2007/05/30 00:33:13 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1956,11 +1956,18 @@
char *p, *q;
int chunks; /* complete chunks! */
int restlen;
+ int out_len;
chunks = srclen / chunklen;
restlen = srclen - chunks * chunklen; /* srclen % chunklen */
- dest = safe_emalloc((srclen + (chunks + 1) * endlen + 1), sizeof(char),
0);
+ out_len = (srclen + (chunks + 1) * endlen + 1);
+
+ if (out_len INT_MAX || out_len = 0) {
+ return NULL;
+ }
+
+ dest = safe_emalloc(out_len, sizeof(char), 0);
for (p = src, q = dest; p (src + srclen - chunklen + 1); ) {
memcpy(q, p, chunklen);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/standard string.c /ext/standard/tests/strings chunk_split.phpt
iliaa Wed May 30 00:35:41 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/ext/standard/tests/strings chunk_split.phpt
/php-src/ext/standard string.c
Log:
MFH: Fixed an interger overflow inside chunk_split(), identified by Gerhard
Wagner
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.230r2=1.1247.2.920.2.231diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.230 php-src/NEWS:1.1247.2.920.2.231
--- php-src/NEWS:1.1247.2.920.2.230 Sun May 27 14:53:37 2007
+++ php-src/NEWSWed May 30 00:35:41 2007
@@ -1,6 +1,8 @@
PHP 4 NEWS
|||
?? ??? 2007, Version 4.4.8
+- Fixed an interger overflow inside chunk_split(), identified by Gerhard
+ Wagner (Ilia)
- Addded max_input_nesting_level php.ini option to limit nesting level of
input variables. Fix for MOPB-03-2007. (Stas)
- Fixed bug #38798 (OpenSSL init corrected in php5 but not in php4). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chunk_split.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u
Index: php-src/ext/standard/tests/strings/chunk_split.phpt
diff -u php-src/ext/standard/tests/strings/chunk_split.phpt:1.1.2.1
php-src/ext/standard/tests/strings/chunk_split.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/strings/chunk_split.phpt:1.1.2.1 Sun Apr 3
18:09:55 2005
+++ php-src/ext/standard/tests/strings/chunk_split.phpt Wed May 30 00:35:41 2007
@@ -8,6 +8,12 @@
echo chunk_split('f', 5).\n;
echo chunk_split(str_repeat('X', 2*76)).\n;
echo chunk_split(test, 10, |end) . \n;
+
+$a=str_repeat(B, 65535);
+$b=1;
+$c=str_repeat(B, 65535);
+var_dump(chunk_split($a,$b,$c));
+
?
--EXPECT--
a-b-c-
@@ -20,3 +26,4 @@
test|end
+bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.333.2.52.2.13r2=1.333.2.52.2.14diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.333.2.52.2.13
php-src/ext/standard/string.c:1.333.2.52.2.14
--- php-src/ext/standard/string.c:1.333.2.52.2.13 Thu May 24 21:31:05 2007
+++ php-src/ext/standard/string.c Wed May 30 00:35:41 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.333.2.52.2.13 2007/05/24 21:31:05 rasmus Exp $ */
+/* $Id: string.c,v 1.333.2.52.2.14 2007/05/30 00:35:41 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1511,11 +1511,18 @@
char *p, *q;
int chunks; /* complete chunks! */
int restlen;
+ int out_len;
chunks = srclen / chunklen;
restlen = srclen - chunks * chunklen; /* srclen % chunklen */
- dest = safe_emalloc(sizeof(char), (srclen + (chunks + 1) * endlen + 1),
0);
+ out_len = (srclen + (chunks + 1) * endlen + 1);
+
+ if (out_len INT_MAX || out_len = 0) {
+ return NULL;
+ }
+
+ dest = safe_emalloc(out_len, sizeof(char), 0);
for (p = src, q = dest; p (src + srclen - chunklen + 1); ) {
memcpy(q, p, chunklen);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings chunk_split.phpt
iliaa Wed May 30 00:38:00 2007 UTC
Modified files:
/php-src/ext/standard/tests/strings chunk_split.phpt
/php-src/ext/standard string.c
Log:
MFB: Fixed an interger overflow inside chunk_split(), identified by
Gerhard Wagner
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chunk_split.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/strings/chunk_split.phpt
diff -u php-src/ext/standard/tests/strings/chunk_split.phpt:1.3
php-src/ext/standard/tests/strings/chunk_split.phpt:1.4
--- php-src/ext/standard/tests/strings/chunk_split.phpt:1.3 Sun Apr 3
18:08:40 2005
+++ php-src/ext/standard/tests/strings/chunk_split.phpt Wed May 30 00:38:00 2007
@@ -6,6 +6,12 @@
echo chunk_split('f', 5).\n;
echo chunk_split(str_repeat('X', 2*76)).\n;
echo chunk_split(test, 10, |end) . \n;
+
+$a=str_repeat(B, 65535);
+$b=1;
+$c=str_repeat(B, 65535);
+var_dump(chunk_split($a,$b,$c));
+
?
--EXPECT--
a-b-c-
@@ -18,3 +24,4 @@
test|end
+bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.637r2=1.638diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.637 php-src/ext/standard/string.c:1.638
--- php-src/ext/standard/string.c:1.637 Thu May 24 21:31:35 2007
+++ php-src/ext/standard/string.c Wed May 30 00:38:00 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.637 2007/05/24 21:31:35 rasmus Exp $ */
+/* $Id: string.c,v 1.638 2007/05/30 00:38:00 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3083,6 +3083,7 @@
int chunks; /* complete chunks! */
int restlen;
int charsize = sizeof(char);
+ int out_len;
if (str_type == IS_UNICODE) {
charsize = sizeof(UChar);
@@ -3091,7 +3092,13 @@
chunks = srclen / chunklen;
restlen = srclen - chunks * chunklen; /* srclen % chunklen */
- dest = safe_emalloc((srclen + (chunks + 1) * endlen + 1), charsize, 0);
+ out_len = (srclen + (chunks + 1) * endlen + 1);
+
+ if ((out_len INT_MAX || out_len = 0) || ((out_len * charsize)
INT_MAX || (out_len * charsize) = 0)) {
+ return NULL;
+ }
+
+ dest = safe_emalloc(out_len, charsize, 0);
for (p = src, q = dest; p (src + charsize * (srclen - chunklen + 1));
) {
memcpy(q, p, chunklen * charsize);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
