[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri May 9 01:31:48 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3040r2=1.3041diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3040 php-src/ChangeLog:1.3041 --- php-src/ChangeLog:1.3040Thu May 8 01:31:40 2008 +++ php-src/ChangeLog Fri May 9 01:31:47 2008 @@ -1,3 +1,71 @@ +2008-05-08 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/basic_functions.c + ext/standard/tests/file/magic_quotes.phpt: + - Use PHP_DEP_FE and PHP_DEP_FALIAS (magic_quotes related functions) + +* (PHP_5_3) + ZendEngine2/zend_API.c + ZendEngine2/tests/bug31720.phpt + ext/standard/tests/array/array_filter_variation2.phpt + ext/standard/tests/array/array_map_variation17.phpt + ext/standard/tests/array/uasort_variation2.phpt: + - MFH: Fixed detection of invalid class name + +* ext/standard/user_filters.c: + - Fix data size + +* ZendEngine2/zend_API.c + ZendEngine2/tests/bug31720.phpt + ext/standard/tests/array/array_filter_variation2.phpt + ext/standard/tests/array/array_map_variation17.phpt + ext/standard/tests/array/array_walk_recursive_variation2.phpt + ext/standard/tests/array/array_walk_variation2.phpt + ext/standard/tests/array/uasort_variation2.phpt: + - Fixed detection of invalid class name + +* ZendEngine2/zend_API.c: + - Fix valgrind report (Conditional jump or move depends on uninitialised + value) + +2008-05-08 Etienne Kneuss [EMAIL PROTECTED] + +* ext/spl/tests/bug38618.phpt: + Sync spl tests with 5.3 + +* (PHP_5_3) + ext/spl/tests/array_023.phpt: + Sync spl tests with HEAD + +2008-05-08 Felipe Pena [EMAIL PROTECTED] + +* ext/imap/php_imap.c: + - Fixed double free + +2008-05-08 Dmitry Stogov [EMAIL PROTECTED] + +* ext/soap/tests/bugs/bug42151.phpt + ext/soap/tests/bugs/bug42151.phpt + ext/soap/tests/bugs/bug42151.phpt: + Fixed test + +2008-05-08 Antony Dovgal [EMAIL PROTECTED] + +* ext/soap/tests/bugs/bug42151.phpt + ext/soap/tests/bugs/bug42151.phpt + ext/soap/tests/bugs/bug42151.phpt: + fix test + +2008-05-08 Matt Wilmas [EMAIL PROTECTED] + +* win32/build/Makefile: + Remove old references to flex.skl + +* (PHP_5_3) + ext/standard/math.c: + Fix build + 2008-05-07 Ilia Alshanetsky [EMAIL PROTECTED] * ext/date/php_date.c:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri May 9 01:31:52 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1295r2=1.1296diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1295 ZendEngine2/ChangeLog:1.1296 --- ZendEngine2/ChangeLog:1.1295Thu May 8 01:31:44 2008 +++ ZendEngine2/ChangeLog Fri May 9 01:31:51 2008 @@ -1,3 +1,18 @@ +2008-05-08 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + zend_API.c + tests/bug31720.phpt: + - MFH: Fixed detection of invalid class name + +* zend_API.c + tests/bug31720.phpt: + - Fixed detection of invalid class name + +* zend_API.c: + - Fix valgrind report (Conditional jump or move depends on uninitialised + value) + 2008-05-07 Felipe Pena [EMAIL PROTECTED] * (PHP_5_3) @@ -22885,7 +22900,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1295 2008/05/08 01:31:44 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1296 2008/05/09 01:31:51 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -24609,7 +24624,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1295 2008/05/08 01:31:44 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1296 2008/05/09 01:31:51 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/soap/tests/bugs bug42151.phpt
tony2001Thu May 8 07:09:03 2008 UTC Modified files: /php-src/ext/soap/tests/bugsbug42151.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42151.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/soap/tests/bugs/bug42151.phpt diff -u php-src/ext/soap/tests/bugs/bug42151.phpt:1.3 php-src/ext/soap/tests/bugs/bug42151.phpt:1.4 --- php-src/ext/soap/tests/bugs/bug42151.phpt:1.3 Fri Feb 15 09:35:47 2008 +++ php-src/ext/soap/tests/bugs/bug42151.phpt Thu May 8 07:09:03 2008 @@ -26,6 +26,6 @@ echo ok\n; ? --EXPECT-- -SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://' +SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://' : failed to load external entity httpx:// ok I don't get executed either. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap/tests/bugs bug42151.phpt
tony2001Thu May 8 07:09:10 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/soap/tests/bugsbug42151.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42151.phpt?r1=1.1.2.1.2.1r2=1.1.2.1.2.2diff_format=u Index: php-src/ext/soap/tests/bugs/bug42151.phpt diff -u php-src/ext/soap/tests/bugs/bug42151.phpt:1.1.2.1.2.1 php-src/ext/soap/tests/bugs/bug42151.phpt:1.1.2.1.2.2 --- php-src/ext/soap/tests/bugs/bug42151.phpt:1.1.2.1.2.1 Fri Feb 15 09:35:53 2008 +++ php-src/ext/soap/tests/bugs/bug42151.phpt Thu May 8 07:09:10 2008 @@ -26,6 +26,6 @@ echo ok\n; ? --EXPECT-- -SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://' +SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://' : failed to load external entity httpx:// ok I don't get executed either. -- 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/soap/tests/bugs bug42151.phpt
tony2001Thu May 8 07:09:18 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/soap/tests/bugsbug42151.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42151.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/soap/tests/bugs/bug42151.phpt diff -u php-src/ext/soap/tests/bugs/bug42151.phpt:1.1.2.1 php-src/ext/soap/tests/bugs/bug42151.phpt:1.1.2.2 --- php-src/ext/soap/tests/bugs/bug42151.phpt:1.1.2.1 Wed Aug 1 10:39:33 2007 +++ php-src/ext/soap/tests/bugs/bug42151.phpt Thu May 8 07:09:17 2008 @@ -26,6 +26,6 @@ echo ok\n; ? --EXPECT-- -SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://' +SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://' : failed to load external entity httpx:// ok I don't get executed either. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c
Congrats on your first commit \o/
Looking forward to a bunch more :)
-Hannes
On Thu, May 8, 2008 at 6:23 AM, Matt Wilmas [EMAIL PROTECTED] wrote:
mattwil Thu May 8 04:23:26 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard math.c
Log:
Fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.7r2=1.131.2.2.2.6.2.8diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.7
php-src/ext/standard/math.c:1.131.2.2.2.6.2.8
--- php-src/ext/standard/math.c:1.131.2.2.2.6.2.7 Tue May 6 10:55:49
2008
+++ php-src/ext/standard/math.c Thu May 8 04:23:26 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.131.2.2.2.6.2.7 2008/05/06 10:55:49 kalle Exp $ */
+/* $Id: math.c,v 1.131.2.2.2.6.2.8 2008/05/08 04:23:26 mattwil Exp $ */
#include php.h
#include php_math.h
@@ -354,7 +354,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, d, num) ==
FAILURE) {
return;
}
- RETURN_DOUBLE(asinh(num));
+ RETURN_DOUBLE(php_asinh(num));
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap/tests/bugs bug42151.phpt
dmitry Thu May 8 09:15:20 2008 UTC Modified files: /php-src/ext/soap/tests/bugsbug42151.phpt Log: Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42151.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/soap/tests/bugs/bug42151.phpt diff -u php-src/ext/soap/tests/bugs/bug42151.phpt:1.4 php-src/ext/soap/tests/bugs/bug42151.phpt:1.5 --- php-src/ext/soap/tests/bugs/bug42151.phpt:1.4 Thu May 8 07:09:03 2008 +++ php-src/ext/soap/tests/bugs/bug42151.phpt Thu May 8 09:15:20 2008 @@ -27,5 +27,6 @@ ? --EXPECT-- SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://' : failed to load external entity httpx:// + ok I don't get executed either. -- 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/soap/tests/bugs bug42151.phpt
dmitry Thu May 8 09:15:49 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/soap/tests/bugsbug42151.phpt Log: Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42151.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/soap/tests/bugs/bug42151.phpt diff -u php-src/ext/soap/tests/bugs/bug42151.phpt:1.1.2.2 php-src/ext/soap/tests/bugs/bug42151.phpt:1.1.2.3 --- php-src/ext/soap/tests/bugs/bug42151.phpt:1.1.2.2 Thu May 8 07:09:17 2008 +++ php-src/ext/soap/tests/bugs/bug42151.phpt Thu May 8 09:15:49 2008 @@ -27,5 +27,6 @@ ? --EXPECT-- SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://' : failed to load external entity httpx:// + ok I don't get executed either. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
felipe Thu May 8 12:00:36 2008 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
- Fixed double free
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.250r2=1.251diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.250 php-src/ext/imap/php_imap.c:1.251
--- php-src/ext/imap/php_imap.c:1.250 Thu Apr 17 11:08:32 2008
+++ php-src/ext/imap/php_imap.c Thu May 8 12:00:36 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.250 2008/04/17 11:08:32 felipe Exp $ */
+/* $Id: php_imap.c,v 1.251 2008/05/08 12:00:36 felipe Exp $ */
#define IMAP41
@@ -,9 +,6 @@
if (dest.data) {
free(dest.data);
}
- if (src.data) {
- free(src.data);
- }
if (src.data src.data != dest.data) {
free(src.data);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests bug38618.phpt
colder Thu May 8 12:03:18 2008 UTC
Modified files:
/php-src/ext/spl/tests bug38618.phpt
Log:
Sync spl tests with 5.3
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug38618.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/bug38618.phpt
diff -u /dev/null php-src/ext/spl/tests/bug38618.phpt:1.2
--- /dev/null Thu May 8 12:03:18 2008
+++ php-src/ext/spl/tests/bug38618.phpt Thu May 8 12:03:18 2008
@@ -0,0 +1,105 @@
+--TEST--
+Bug #38618 (RecursiveArrayIterator::hasChildren() follows objects)
+--FILE--
+?php # vim:ft=php
+
+class FruitPublic
+{
+ public $title;
+
+ public function __construct($title)
+ {
+$this-title = $title;
+ }
+
+ public function __toString()
+ {
+return $this-title;
+ }
+}
+
+class FruitProtected
+{
+ protected $title;
+
+ public function __construct($title)
+ {
+$this-title = $title;
+ }
+
+ public function __toString()
+ {
+return $this-title;
+ }
+}
+
+function test_array($array, $which, $flags = 0)
+{
+ echo ===$which===\n;
+ $it = new RecursiveArrayIterator($array, $flags);
+ foreach (new RecursiveIteratorIterator($it) as $k = $fruit) {
+echo $k , ' = ', $fruit, \n;
+ }
+}
+
+$array = array(
+ 1 = array(
+1 = array(
+ 1 = 'apple',
+),
+2 = array(
+ 1 = 'grape',
+),
+ ),
+);
+
+test_array($array, 'Default with array');
+
+$array = array(
+ 1 = array(
+1 = array(
+ 1 = new FruitPublic('apple'),
+),
+2 = array(
+ 1 = new FruitPublic('grape'),
+),
+ ),
+);
+
+test_array($array, 'Public Property');
+
+$array = array(
+ 1 = array(
+1 = array(
+ 1 = new FruitProtected('apple'),
+),
+2 = array(
+ 1 = new FruitProtected('grape'),
+),
+ ),
+);
+
+test_array($array, 'Protected Property');
+
+test_array($array, 'Public Property New',
RecursiveArrayIterator::CHILD_ARRAYS_ONLY);
+test_array($array, 'Protected Property New',
RecursiveArrayIterator::CHILD_ARRAYS_ONLY);
+?
+===DONE===
+?php exit(0); ?
+?
+===DONE===
+--EXPECTF--
+===Default with array===
+1 = apple
+1 = grape
+===Public Property===
+title = apple
+title = grape
+===Protected Property===
+===Public Property New===
+1 = apple
+1 = grape
+===Protected Property New===
+1 = apple
+1 = grape
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests array_023.phpt
colder Thu May 8 12:02:17 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests array_023.phpt
Log:
Sync spl tests with HEAD
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/array_023.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/array_023.phpt
+++ php-src/ext/spl/tests/array_023.phpt
--TEST--
Testing class extending to ArrayObject and serialize
--FILE--
?php
class Name extends ArrayObject
{
public $var = 'a';
protected $bar = 'b';
private $foo = 'c';
}
$a = new Name();
var_dump($a);
var_dump($a-var);
$a = unserialize(serialize($a));
var_dump($a);
var_dump($a-var);
?
--EXPECT--
object(Name)#1 (4) {
[var]=
string(1) a
[bar:protected]=
string(1) b
[foo:Name:private]=
string(1) c
[storage:ArrayObject:private]=
array(0) {
}
}
string(1) a
object(Name)#2 (4) {
[var]=
string(1) a
[bar:protected]=
string(1) b
[foo:Name:private]=
string(1) c
[storage:ArrayObject:private]=
array(0) {
}
}
string(1) a
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Thu May 8 16:26:40 2008 UTC Modified files: /CVSROOTavail Log: Oops, wrong avail entry there http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1393r2=1.1394diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1393 CVSROOT/avail:1.1394 --- CVSROOT/avail:1.1393Thu May 8 00:48:30 2008 +++ CVSROOT/avail Thu May 8 16:26:39 2008 @@ -20,7 +20,7 @@ avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd # Some people have access to tests in the Engine -avail|magnus,michael,zoe,jmessa,mattwil|Zend/tests,ZendEngine2/tests +avail|magnus,michael,zoe,jmessa|Zend/tests,ZendEngine2/tests # fastcgi implementation for IIS avail|shane,wez,edink|fastcgi-isapi @@ -35,7 +35,7 @@ avail|bjori,gwynne|phd # People who work on the Engine - not people with just tests access -avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess|Zend,ZendEngine2,TSRM +avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil|Zend,ZendEngine2,TSRM # The PHP Documentation Group maintains the documentation and its # translations. -- 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 array_filter_variation2.phpt array_map_variation17.phpt array_walk_recursive_variation2.phpt array_walk_variation2.phpt uasort_variation2.phpt ZendEng
felipe Thu May 8 16:58:44 2008 UTC
Modified files:
/ZendEngine2zend_API.c
/ZendEngine2/tests bug31720.phpt
/php-src/ext/standard/tests/array array_filter_variation2.phpt
array_map_variation17.phpt
array_walk_recursive_variation2.phpt
array_walk_variation2.phpt
uasort_variation2.phpt
Log:
- Fixed detection of invalid class name
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.469r2=1.470diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.469 ZendEngine2/zend_API.c:1.470
--- ZendEngine2/zend_API.c:1.469Thu May 8 15:39:35 2008
+++ ZendEngine2/zend_API.c Thu May 8 16:58:43 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.c,v 1.469 2008/05/08 15:39:35 felipe Exp $ */
+/* $Id: zend_API.c,v 1.470 2008/05/08 16:58:43 felipe Exp $ */
#include zend.h
#include zend_execute.h
@@ -3035,7 +3035,7 @@
}
} else {
if
(zend_hash_num_elements(Z_ARRVAL_P(callable)) == 2) {
- if (!obj) {
+ if (!obj || (Z_TYPE_PP(obj) !=
IS_OBJECT Z_TYPE_PP(obj) != IS_STRING Z_TYPE_PP(obj) != IS_UNICODE)) {
if (error)
zend_spprintf(error, 0, first array member is not a valid class name or
object);
} else {
if (error)
zend_spprintf(error, 0, second array member is not a valid method);
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug31720.phpt?r1=1.5r2=1.6diff_format=u
Index: ZendEngine2/tests/bug31720.phpt
diff -u ZendEngine2/tests/bug31720.phpt:1.5 ZendEngine2/tests/bug31720.phpt:1.6
--- ZendEngine2/tests/bug31720.phpt:1.5 Mon Feb 4 14:29:51 2008
+++ ZendEngine2/tests/bug31720.phpt Thu May 8 16:58:43 2008
@@ -10,5 +10,5 @@
--EXPECTF--
Notice: Undefined variable: nonesuchvar in %s on line %d
-Warning: array_walk() expects parameter 2 to be a valid callback, second array
member is not a valid method in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, first array
member is not a valid class name or object in %s on line %d
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_filter_variation2.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/array/array_filter_variation2.phpt
diff -u php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.3
php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.4
--- php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.3 Mon Feb
4 15:22:08 2008
+++ php-src/ext/standard/tests/array/array_filter_variation2.phpt Thu May
8 16:58:43 2008
@@ -134,7 +134,7 @@
Warning: array_filter() expects parameter 2 to be a valid callback, array must
have exactly two members in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_filter() expects parameter 2 to be a valid callback, second
array member is not a valid method in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, first
array member is not a valid class name or object in %s on line %d
NULL
-- Iteration 14 --
Warning: array_filter() expects parameter 2 to be a valid callback, first
array member is not a valid class name or object in %s on line %d
@@ -221,7 +221,7 @@
Warning: array_filter() expects parameter 2 to be a valid callback, array must
have exactly two members in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_filter() expects parameter 2 to be a valid callback, second
array member is not a valid method in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, first
array member is not a valid class name or object in %s on line %d
NULL
-- Iteration 14 --
Warning: array_filter() expects parameter 2 to be a valid callback, first
array member is not a valid class name or object in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_variation17.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/array/array_map_variation17.phpt
diff -u php-src/ext/standard/tests/array/array_map_variation17.phpt:1.2
php-src/ext/standard/tests/array/array_map_variation17.phpt:1.3
--- php-src/ext/standard/tests/array/array_map_variation17.phpt:1.2 Mon Feb
4 12:37:15 2008
+++ php-src/ext/standard/tests/array/array_map_variation17.phpt Thu May 8
16:58:43 2008
@@ -141,11 +141,11 @@
NULL
-- Iteration 17 --
-Warning: array_map() expects parameter 1 to be a valid callback, second array
member is not a valid
[PHP-CVS] cvs: php-src /ext/standard user_filters.c
felipe Thu May 8 17:22:07 2008 UTC
Modified files:
/php-src/ext/standard user_filters.c
Log:
- Fix data size
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.53r2=1.54diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.53
php-src/ext/standard/user_filters.c:1.54
--- php-src/ext/standard/user_filters.c:1.53Thu Feb 28 14:16:14 2008
+++ php-src/ext/standard/user_filters.c Thu May 8 17:22:07 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: user_filters.c,v 1.53 2008/02/28 14:16:14 felipe Exp $ */
+/* $Id: user_filters.c,v 1.54 2008/05/08 17:22:07 felipe Exp $ */
#include php.h
#include php_globals.h
@@ -636,7 +636,7 @@
fdat-classname_len = classname_len;
if (zend_hash_add(BG(user_filter_map), filtername, filtername_len + 1,
(void*)fdat,
- sizeof(*fdat) + classname_len, NULL) == SUCCESS
+ sizeof(*fdat), NULL) == SUCCESS
php_stream_filter_register_factory_volatile(filtername,
user_filter_factory TSRMLS_CC) == SUCCESS) {
RETVAL_TRUE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard user_filters.c
felipe Thu May 8 18:28:25 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard user_filters.c Log: - MFH: Fixed data size http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.4.2.9.2.4r2=1.31.2.4.2.9.2.5diff_format=u Index: php-src/ext/standard/user_filters.c diff -u php-src/ext/standard/user_filters.c:1.31.2.4.2.9.2.4 php-src/ext/standard/user_filters.c:1.31.2.4.2.9.2.5 --- php-src/ext/standard/user_filters.c:1.31.2.4.2.9.2.4Mon Mar 10 22:12:36 2008 +++ php-src/ext/standard/user_filters.c Thu May 8 18:28:25 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: user_filters.c,v 1.31.2.4.2.9.2.4 2008/03/10 22:12:36 felipe Exp $ */ +/* $Id: user_filters.c,v 1.31.2.4.2.9.2.5 2008/05/08 18:28:25 felipe Exp $ */ #include php.h #include php_globals.h @@ -584,7 +584,7 @@ zend_hash_init(BG(user_filter_map), 5, NULL, (dtor_func_t) filter_item_dtor, 0); } - fdat = ecalloc(1, sizeof(*fdat) + classname_len); + fdat = ecalloc(1, sizeof(struct php_user_filter_data) + classname_len); memcpy(fdat-classname, classname, classname_len); if (zend_hash_add(BG(user_filter_map), filtername, filtername_len + 1, (void*)fdat, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_filter_variation2.phpt array_map_variation17.phpt uasort_variation2.phpt ZendEngine2 zend_API.c ZendEngine2/tests bug31720.phpt
felipe Thu May 8 18:51:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2zend_API.c
/ZendEngine2/tests bug31720.phpt
/php-src/ext/standard/tests/array array_filter_variation2.phpt
array_map_variation17.phpt
uasort_variation2.phpt
Log:
- MFH: Fixed detection of invalid class name
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34.2.34r2=1.296.2.27.2.34.2.35diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34.2.34
ZendEngine2/zend_API.c:1.296.2.27.2.34.2.35
--- ZendEngine2/zend_API.c:1.296.2.27.2.34.2.34 Mon May 5 09:44:39 2008
+++ ZendEngine2/zend_API.c Thu May 8 18:51:28 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.c,v 1.296.2.27.2.34.2.34 2008/05/05 09:44:39 dmitry Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.34.2.35 2008/05/08 18:51:28 felipe Exp $ */
#include zend.h
#include zend_execute.h
@@ -2571,7 +2571,7 @@
}
} else {
if
(zend_hash_num_elements(Z_ARRVAL_P(callable)) == 2) {
- if (!obj) {
+ if (!obj || (Z_TYPE_PP(obj) !=
IS_STRING Z_TYPE_PP(obj) != IS_OBJECT)) {
if (error)
zend_spprintf(error, 0, first array member is not a valid class name or
object);
} else {
if (error)
zend_spprintf(error, 0, second array member is not a valid method);
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug31720.phpt?r1=1.3.6.2r2=1.3.6.3diff_format=u
Index: ZendEngine2/tests/bug31720.phpt
diff -u ZendEngine2/tests/bug31720.phpt:1.3.6.2
ZendEngine2/tests/bug31720.phpt:1.3.6.3
--- ZendEngine2/tests/bug31720.phpt:1.3.6.2 Sat Feb 2 00:55:35 2008
+++ ZendEngine2/tests/bug31720.phpt Thu May 8 18:51:28 2008
@@ -10,5 +10,5 @@
--EXPECTF--
Notice: Undefined variable: nonesuchvar in %s on line %d
-Warning: array_walk() expects parameter 2 to be a valid callback, second array
member is not a valid method in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, first array
member is not a valid class name or object in %s on line %d
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_filter_variation2.phpt?r1=1.1.4.4r2=1.1.4.5diff_format=u
Index: php-src/ext/standard/tests/array/array_filter_variation2.phpt
diff -u php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.1.4.4
php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.1.4.5
--- php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.1.4.4
Sat Feb 2 01:31:18 2008
+++ php-src/ext/standard/tests/array/array_filter_variation2.phpt Thu May
8 18:51:28 2008
@@ -134,7 +134,7 @@
Warning: array_filter() expects parameter 2 to be a valid callback, array must
have exactly two members in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_filter() expects parameter 2 to be a valid callback, second
array member is not a valid method in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, first
array member is not a valid class name or object in %s on line %d
NULL
-- Iteration 14 --
Warning: array_filter() expects parameter 2 to be a valid callback, first
array member is not a valid class name or object in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_variation17.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/standard/tests/array/array_map_variation17.phpt
diff -u php-src/ext/standard/tests/array/array_map_variation17.phpt:1.1.2.5
php-src/ext/standard/tests/array/array_map_variation17.phpt:1.1.2.6
--- php-src/ext/standard/tests/array/array_map_variation17.phpt:1.1.2.5 Sat Feb
2 03:00:57 2008
+++ php-src/ext/standard/tests/array/array_map_variation17.phpt Thu May 8
18:51:28 2008
@@ -141,11 +141,11 @@
NULL
-- Iteration 17 --
-Warning: array_map() expects parameter 1 to be a valid callback, second array
member is not a valid method in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, first array
member is not a valid class name or object in %s on line %d
NULL
-- Iteration 18 --
-Warning: array_map() expects parameter 1 to be a valid callback, second array
member is not a valid method in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, first array
member is not a valid class name or object in %s on line %d
NULL
-- Iteration 19 --
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c /ext/standard/tests/file magic_quotes.phpt
felipe Thu May 8 22:21:19 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c
/php-src/ext/standard/tests/filemagic_quotes.phpt
Log:
- Use PHP_DEP_FE and PHP_DEP_FALIAS (magic_quotes related functions)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.32r2=1.725.2.31.2.64.2.33diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.32
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.33
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.32 Tue May 6
18:01:32 2008
+++ php-src/ext/standard/basic_functions.c Thu May 8 22:21:18 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.32 2008/05/06 18:01:32 iliaa Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.33 2008/05/08 22:21:18 felipe
Exp $ */
#include php.h
#include php_streams.h
@@ -3345,10 +3345,10 @@
PHP_FE(set_time_limit,
arginfo_set_time_limit)
PHP_FE(get_cfg_var,
arginfo_get_cfg_var)
- PHP_FALIAS(magic_quotes_runtime,set_magic_quotes_runtime,
NULL)
- PHP_FE(set_magic_quotes_runtime,
NULL)
- PHP_FE(get_magic_quotes_gpc,
NULL)
- PHP_FE(get_magic_quotes_runtime,
NULL)
+ PHP_DEP_FALIAS(magic_quotes_runtime,set_magic_quotes_runtime,
NULL)
+ PHP_DEP_FE(set_magic_quotes_runtime,
NULL)
+ PHP_DEP_FE(get_magic_quotes_gpc,
NULL)
+ PHP_DEP_FE(get_magic_quotes_runtime,
NULL)
PHP_FE(import_request_variables,
arginfo_import_request_variables)
PHP_FE(error_log,
arginfo_error_log)
@@ -4927,8 +4927,6 @@
RETURN_FALSE;
}
- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, This function is
deprecated and removed in PHP 6. See
http://php.net/{migrate}#set_magic_quotes_runtime for details.);
-
convert_to_boolean_ex(new_setting);
PG(magic_quotes_runtime) = (zend_bool) Z_LVAL_PP(new_setting);
@@ -4940,7 +4938,6 @@
Get the current active configuration setting of magic_quotes_runtime */
PHP_FUNCTION(get_magic_quotes_runtime)
{
- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, This function is
deprecated and removed in PHP 6. See
http://php.net/{migrate}#get_magic_quotes_runtime for details.);
RETURN_LONG(PG(magic_quotes_runtime));
}
/* }}} */
@@ -4949,7 +4946,6 @@
Get the current active configuration setting of magic_quotes_gpc */
PHP_FUNCTION(get_magic_quotes_gpc)
{
- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, This function is
deprecated and removed in PHP 6. See
http://php.net/{migrate}#get_magic_quotes_gpc for details.);
RETURN_LONG(PG(magic_quotes_gpc));
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/magic_quotes.phpt?r1=1.1.2.1.2.2r2=1.1.2.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/magic_quotes.phpt
diff -u php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.2
php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.3
--- php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.2 Sun Feb
24 11:27:26 2008
+++ php-src/ext/standard/tests/file/magic_quotes.phpt Thu May 8 22:21:19 2008
@@ -43,44 +43,46 @@
echo Done\n;
?
--EXPECTF--
-Deprecated: get_magic_quotes_runtime(): This function is deprecated and
removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details.
in %s on line %d
+Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(0)
-Deprecated: get_magic_quotes_runtime(): This function is deprecated and
removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details.
in %s on line %d
+Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(0)
-Deprecated: set_magic_quotes_runtime(): This function is deprecated and
removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details.
in %s on line %d
