[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

2009-11-24 Thread Jani Taskinen
jani Wed, 25 Nov 2009 07:48:43 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291294

Log:
*sigh*

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-11-25 07:40:13 UTC (rev 291293)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-11-25 07:48:43 UTC (rev 291294)
@@ -87,8 +87,8 @@
   (David Soria Parra)
 - Fixed bug #49098 (mysqli segfault on error). (Rasmus)

+
 19 Nov 2009, PHP 5.3.1
-
 - Added "max_file_uploads" INI directive, which can be set to limit the
   number of file uploads per-request to 20 by default, to prevent possible
   DOS via temporary file exhaustion. (Ilia)
@@ -129,11 +129,11 @@
 - Fixed BC break in mime_content_type(), removes the content encoding. (Scott)

 - Changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case
-  insensitive (garretts)
+  insensitive. (garretts)
 - Restored shebang line check to CGI sapi (not checked by scanner anymore).
   (Jani)

-- Improve symbolic, mounted volume and junctions support for realpath on
+- Improved symbolic, mounted volume and junctions support for realpath on
   Windows. (Pierre)
 - Improved readlink on Windows, suppress \??\ and use the drive syntax only.
   (Pierre)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

2009-11-24 Thread Jani Taskinen

Pierre Joye wrote:

pajoye   Wed, 25 Nov 2009 07:40:13 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291293

Log:
- merge NEWS from 5.3.1

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS




..and now there are entries which did not go in 5.3.1 (not sure though) plus 
they're there twice (under 5.3.2)..


--Jani


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

2009-11-24 Thread Pierre Joye
pajoye   Wed, 25 Nov 2009 07:40:13 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291293

Log:
- merge NEWS from 5.3.1

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2009-11-25 07:21:38 UTC (rev 291292)
+++ php/php-src/branches/PHP_5_3/NEWS	2009-11-25 07:40:13 UTC (rev 291293)
@@ -87,11 +87,254 @@
   (David Soria Parra)
 - Fixed bug #49098 (mysqli segfault on error). (Rasmus)

+19 Nov 2009, PHP 5.3.1

-?? ??? 2009, PHP 5.3.1
-# Will be merged in from branches/PHP_5_3_1 once released
-# Pleas add stuff under 5.3.2
+- Added "max_file_uploads" INI directive, which can be set to limit the
+  number of file uploads per-request to 20 by default, to prevent possible
+  DOS via temporary file exhaustion. (Ilia)
+- Added missing sanity checks around exif processing. (Ilia)
+- Added error constant when json_encode() detects an invalid UTF-8 sequence.
+  (Scott)
+- Added support for ACL on Windows for thread safe SAPI (Apache2 for example)
+  and fix its support on NTS. (Pierre)

+- Upgraded bundled sqlite to version 3.6.19. (Scott)
+- Updated timezone database to version 2009.17 (2009q). (Derick)
+
+- Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)
+- Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak.
+  (Rasmus)
+- Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz
+  Stachowiak.  (Rasmus)
+- Fixed certificate validation inside php_openssl_apply_verification_policy
+  (Ryan Sleevi, Ilia)
+- Fixed crash in SQLiteDatabase::ArrayQuery() and SQLiteDatabase::SingleQuery()
+  when calling using Reflection. (Felipe)
+- Fixed crash when instantiating PDORow and PDOStatement through Reflection.
+  (Felipe)
+- Fixed sanity check for the color index in imagecolortransparent. (Pierre)
+- Fixed scandir/readdir when used mounted points on Windows. (Pierre)
+- Fixed zlib.deflate compress filter to actually accept level parameter. (Jani)
+- Fixed leak on error in popen/exec (and related functions) on Windows.
+  (Pierre)
+- Fixed possible bad caching of symlinked directories in the realpath cache
+  on Windows. (Pierre)
+- Fixed atime and mtime in stat related functions on Windows. (Pierre)
+- Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and
+  Functors. (Christian Seiler)
+- Fixed open_basedir circumvention for "mail.log" ini directive.
+  (Maksymilian Arciemowicz, Stas)
+- Fixed signature generation/validation for zip archives in ext/phar. (Greg)
+- Fixed memory leak in stream_is_local(). (Felipe, Tony)
+- Fixed BC break in mime_content_type(), removes the content encoding. (Scott)
+
+- Changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case
+  insensitive (garretts)
+- Restored shebang line check to CGI sapi (not checked by scanner anymore).
+  (Jani)
+
+- Improve symbolic, mounted volume and junctions support for realpath on
+  Windows. (Pierre)
+- Improved readlink on Windows, suppress \??\ and use the drive syntax only.
+  (Pierre)
+- Improved dns_get_record()  support on windows. Always available when
+  IPv6 is support is installed, format is now the same than on unix. (Pierre)
+- Improved the DNS functions on OSX to use newer APIs, also use Bind 9 API
+  where available on other platforms. (Scott)
+- Improved shared extension loading on OSX to use the standard Unix dlopen()
+  API. (Scott)
+
+- Fixed bug #50063 (safe_mode_include_dir fails). (Johannes, christian at
+  elmerot dot se)
+- Fixed bug #50052 (Different Hashes on Windows and Linux on wrong Salt size).
+  (Pierre)
+- Fixed bug #49910 (no support for ././@LongLink for long filenames in phar
+  tar support). (Greg)
+- Fixed bug #49908 (throwing exception in __autoload crashes when interface
+  is not defined). (Felipe)
+- Fixed bug #49847 (exec() fails to return data inside 2nd parameter, given
+  output lines >4095 bytes). (Ilia)
+- Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani)
+- Fixed bug #49757 (long2ip() can return wrong value in a multi-threaded
+  applications). (Ilia, Florian Anderiasch)
+- Fixed bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes).
+  (Sriram Natarajan)
+- Fixed bug #49732 (crashes when using fileinfo when timestamp conversion
+  fails). (Pierre)
+- Fixed bug #49698 (Unexpected change in strnatcasecmp()). (Rasmus)
+- Fixed bug #49630 (imap_listscan function missing). (Felipe)
+- Fixed bug #49572 (use of C++ style comments causes build failure).
+  (Sriram Natarajan)
+- Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning "CURLPROTO_FILE
+  cannot be set"). (Felipe)
+- Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted after
+  fclose). (Ilia)
+- Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters).
+  (Ilia)
+- Fixed bug #49447 

[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_3/NEWS

2009-11-24 Thread Jani Taskinen
jani Wed, 25 Nov 2009 07:21:38 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291292

Log:
- Do not forget NEWS for 5.2..

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-11-25 05:44:27 UTC (rev 291291)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-11-25 07:21:38 UTC (rev 291292)
@@ -8,6 +8,7 @@
 - Changed "post_max_size" php.ini directive to allow unlimited post size by
   setting it to 0. (Rasmus)

+- Fixed the m4 scripts to support autoconf-2.64+. (Rasmus)
 - Fixed error_log() to be binary safe when using message_type 3. (Jani)

 - Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays).

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-11-25 05:44:27 UTC (rev 291291)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-11-25 07:21:38 UTC (rev 291292)
@@ -20,12 +20,12 @@
 - Implemented FR #49253 (added support for libcurl's CERTINFO option).
   (Linus Nielsen Feltzing )

+- Fixed the m4 scripts to support autoconf-2.64+. (Rasmus)
 - Fixed error_log() to be binary safe when using message_type 3. (Jani)
 - Fixed unnecessary invocation of setitimer when timeouts have been disabled.
   (Arvind Srinivasan)
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)
-- Fixed the m4 scripts to support autoconf-2.64+. (Rasmus)

 - Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays).
   (Felipe)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt trunk/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt

2009-11-24 Thread Rasmus Lerdorf
rasmus   Wed, 25 Nov 2009 05:44:27 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291291

Log:
The constructor generates that next line of output, so the expected
output had these 2 lines in the wrong order.  Test your tests!

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
U   
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
2009-11-25 05:38:33 UTC (rev 291290)
+++ 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
2009-11-25 05:44:27 UTC (rev 291291)
@@ -142,8 +142,8 @@
 }

 Using PDO::FETCH_CLASS to fetch the object from DB and unserialize it...
+myclass::__construct(PDO shall call __construct())
 myclass::__set(myobj, 'C:7:"myclass":19:{Data from serialize}')
-myclass::__construct(PDO shall call __construct())
 object(myclass)#%d (2) {
   [%u|b%"myprotected":protected]=>
   %unicode|string%(19) "a protected propery"

Modified: 
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
===
--- php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt   
2009-11-25 05:38:33 UTC (rev 291290)
+++ php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt   
2009-11-25 05:44:27 UTC (rev 291291)
@@ -142,8 +142,8 @@
 }

 Using PDO::FETCH_CLASS to fetch the object from DB and unserialize it...
+myclass::__construct(PDO shall call __construct())
 myclass::__set(myobj, 'C:7:"myclass":19:{Data from serialize}')
-myclass::__construct(PDO shall call __construct())
 object(myclass)#%d (2) {
   [%u|b%"myprotected":protected]=>
   %unicode|string%(19) "a protected propery"

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt

2009-11-24 Thread Rasmus Lerdorf
rasmus   Wed, 25 Nov 2009 05:38:33 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291290

Log:
And there is no 23,24,25 in this test at all.  Perhaps these lines were
added to the wrong file by mistake?  Those were the same ones missing from
pdo_mysql___construct_options.phpt

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
U   
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
2009-11-25 05:29:57 UTC (rev 291289)
+++ 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
2009-11-25 05:38:33 UTC (rev 291290)
@@ -78,8 +78,5 @@
 ?>
 --EXPECTF--
 [001] Expecting default value for 'PDO::MYSQL_ATTR_INIT_COMMAND' of ''/string, 
getAttribute() reports setting ''/boolean
-[023] Execting 'SET @a=1'/string got ''/boolean' for options 
'PDO::MYSQL_ATTR_INIT_COMMAND'
-[024] SQLSTATE[42000] [1065] Query was empty
-[025] SQLSTATE[42S02] [1146] Table '%snonexistent' doesn't exist
 [026] Execting '1'/boolean got ''/boolean' for options 
'PDO::MYSQL_ATTR_READ_DEFAULT_FILE'
 done!

Modified: 
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
===
--- 
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
   2009-11-25 05:29:57 UTC (rev 291289)
+++ 
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
   2009-11-25 05:38:33 UTC (rev 291290)
@@ -78,8 +78,5 @@
 ?>
 --EXPECTF--
 [001] Expecting default value for 'PDO::MYSQL_ATTR_INIT_COMMAND' of ''/string, 
getAttribute() reports setting ''/boolean
-[023] Execting 'SET @a=1'/string got ''/boolean' for options 
'PDO::MYSQL_ATTR_INIT_COMMAND'
-[024] SQLSTATE[42000] [1065] Query was empty
-[025] SQLSTATE[42S02] [1146] Table '%snonexistent' doesn't exist
 [026] Execting '1'/boolean got ''/boolean' for options 
'PDO::MYSQL_ATTR_READ_DEFAULT_FILE'
 done!

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt

2009-11-24 Thread Rasmus Lerdorf
rasmus   Wed, 25 Nov 2009 05:29:57 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291289

Log:
Unless I am completely misreading this test case, these 3 lines at the
end should be in the expected output.

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
U   php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
 2009-11-25 04:00:55 UTC (rev 291288)
+++ 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
 2009-11-25 05:29:57 UTC (rev 291289)
@@ -176,4 +176,7 @@
 Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this 
function: driver does not support that attribute in %s on line %d
 [018] PDO::MYSQL_ATTR_DIRECT_QUERY should be off
 [021] Execting '1'/boolean got ''/boolean' for options 
'PDO::MYSQL_ATTR_LOCAL_INFILE'
-done!
\ No newline at end of file
+[023] Execting 'SET @a=1'/string got ''/boolean' for options 
'PDO::MYSQL_ATTR_INIT_COMMAND'
+[024] SQLSTATE[42000] [1065] Query was empty
+[025] SQLSTATE[42S02] [1146] Table 'test.nonexistent' doesn't exist
+done!

Modified: 
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
===
--- php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
2009-11-25 04:00:55 UTC (rev 291288)
+++ php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
2009-11-25 05:29:57 UTC (rev 291289)
@@ -176,4 +176,7 @@
 Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this 
function: driver does not support that attribute in %s on line %d
 [018] PDO::MYSQL_ATTR_DIRECT_QUERY should be off
 [021] Execting '1'/boolean got ''/boolean' for options 
'PDO::MYSQL_ATTR_LOCAL_INFILE'
-done!
\ No newline at end of file
+[023] Execting 'SET @a=1'/string got ''/boolean' for options 
'PDO::MYSQL_ATTR_INIT_COMMAND'
+[024] SQLSTATE[42000] [1065] Query was empty
+[025] SQLSTATE[42S02] [1146] Table 'test.nonexistent' doesn't exist
+done!

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/tests/general_functions/proc_nice_variation5.phpt branches/PHP_5_3/ext/standard/tests/general_functions/proc_nice_variation5.phpt trunk/ext/s

2009-11-24 Thread Rasmus Lerdorf
rasmus   Wed, 25 Nov 2009 04:00:55 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291288

Log:
Another test that doesn't work as root

Changed paths:
U   
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/proc_nice_variation5.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_nice_variation5.phpt
U   
php/php-src/trunk/ext/standard/tests/general_functions/proc_nice_variation5.phpt

Modified: 
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/proc_nice_variation5.phpt
===
--- 
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/proc_nice_variation5.phpt
 2009-11-25 03:53:50 UTC (rev 291287)
+++ 
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/proc_nice_variation5.phpt
 2009-11-25 04:00:55 UTC (rev 291288)
@@ -5,6 +5,10 @@
 Fabio Fabbrucci (fabbru...@grupporetina.com)
 Michele Orselli (m...@ideato.it)
 Simone Gentili (sensora...@gmail.com)
+--SKIPIF--
+
 --FILE--
 
 --FILE--
 
 --FILE--
 -- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation2.phpt branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation3.phpt branches/PHP_5_2/ext/posix/tests/posix_seteui

2009-11-24 Thread Rasmus Lerdorf
rasmus   Wed, 25 Nov 2009 03:53:50 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291287

Log:
These tests don't work when run as root

Changed paths:
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation2.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation3.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation4.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation5.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_setgid_variation2.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_setgid_variation3.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_setgid_variation4.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_setgid_variation5.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_setuid_variation2.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_setuid_variation3.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_setuid_variation4.phpt
U   
php/php-src/branches/PHP_5_2/ext/posix/tests/posix_setuid_variation5.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_seteuid_variation2.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_seteuid_variation3.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_seteuid_variation4.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_seteuid_variation5.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_setgid_variation2.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_setgid_variation3.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_setgid_variation4.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_setgid_variation5.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_setuid_variation2.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_setuid_variation3.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_setuid_variation4.phpt
U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_setuid_variation5.phpt
U   php/php-src/trunk/ext/posix/tests/posix_seteuid_variation2.phpt
U   php/php-src/trunk/ext/posix/tests/posix_seteuid_variation3.phpt
U   php/php-src/trunk/ext/posix/tests/posix_seteuid_variation4.phpt
U   php/php-src/trunk/ext/posix/tests/posix_seteuid_variation5.phpt
U   php/php-src/trunk/ext/posix/tests/posix_setgid_variation2.phpt
U   php/php-src/trunk/ext/posix/tests/posix_setgid_variation3.phpt
U   php/php-src/trunk/ext/posix/tests/posix_setgid_variation4.phpt
U   php/php-src/trunk/ext/posix/tests/posix_setgid_variation5.phpt
U   php/php-src/trunk/ext/posix/tests/posix_setuid_variation2.phpt
U   php/php-src/trunk/ext/posix/tests/posix_setuid_variation3.phpt
U   php/php-src/trunk/ext/posix/tests/posix_setuid_variation4.phpt
U   php/php-src/trunk/ext/posix/tests/posix_setuid_variation5.phpt

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation2.phpt
===
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation2.phpt	2009-11-25 02:42:03 UTC (rev 291286)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation2.phpt	2009-11-25 03:53:50 UTC (rev 291287)
@@ -3,6 +3,7 @@
 --SKIPIF--
 
 --CREDITS--
 Marco Fabbri mrfab...@gmail.com

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation3.phpt
===
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation3.phpt	2009-11-25 02:42:03 UTC (rev 291286)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation3.phpt	2009-11-25 03:53:50 UTC (rev 291287)
@@ -3,6 +3,7 @@
 --SKIPIF--
 
 --CREDITS--
 Marco Fabbri mrfab...@gmail.com

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation4.phpt
===
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation4.phpt	2009-11-25 02:42:03 UTC (rev 291286)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation4.phpt	2009-11-25 03:53:50 UTC (rev 291287)
@@ -3,6 +3,7 @@
 --SKIPIF--
 
 --CREDITS--
 Marco Fabbri mrfab...@gmail.com

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation5.phpt
===
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation5.phpt	2009-11-25 02:42:03 UTC (rev 291286)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_seteuid_variation5.phpt	2009-11-25 03:53:50 UTC (rev 291287)
@@ -3,6 +3,7 @@
 --SKIPIF--
 
 --CREDITS--
 Marco Fabbri mrfab...@gmail.com

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_setgid_variation2.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

2009-11-24 Thread Rasmus Lerdorf
rasmus   Wed, 25 Nov 2009 02:42:03 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291286

Log:
.

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-11-25 02:03:02 UTC (rev 291285)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-11-25 02:42:03 UTC (rev 291286)
@@ -25,6 +25,7 @@
   (Arvind Srinivasan)
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)
+- Fixed the m4 scripts to support autoconf-2.64+. (Rasmus)

 - Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays).
   (Felipe)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/xmlrpc/tests/bug50285.phpt branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/xmlrpc/tests/

2009-11-24 Thread Felipe Pena
felipe   Wed, 25 Nov 2009 02:03:02 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291285

Log:
- Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays)

Bug: http://bugs.php.net/50285 (Verified) xmlrpc does not preserve keys in 
encoded indexed arrays
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
A   php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50285.phpt
U   php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c
U   php/php-src/branches/PHP_5_3/NEWS
A   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug50285.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c
A   php/php-src/trunk/ext/xmlrpc/tests/bug50285.phpt
U   php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS	2009-11-25 01:36:41 UTC (rev 291284)
+++ php/php-src/branches/PHP_5_2/NEWS	2009-11-25 02:03:02 UTC (rev 291285)
@@ -10,6 +10,8 @@

 - Fixed error_log() to be binary safe when using message_type 3. (Jani)

+- Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays).
+  (Felipe)
 - Fixed bug #50282 (xmlrpc_encode_request() changes object into array in
   calling function). (Felipe)
 - Fixed bug #50255 (isset() and empty() silently casts array to object).

Added: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50285.phpt
===
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50285.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50285.phpt	2009-11-25 02:03:02 UTC (rev 291285)
@@ -0,0 +1,115 @@
+--TEST--
+Bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays)
+--FILE--
+'One', 3=>'Three', 5=>'Five');
+}
+
+function test2($func, $params) {
+return array('One', 'Three', 'Five', 5);
+}
+
+function test3($func, $params) {
+return array('One', 3 => 'Three', b'Five' => 5, 'Six');
+}
+
+function test4($func, $params) {
+return array('One', 'Three', 'Five', b'Six' => 6);
+}
+
+$server = xmlrpc_server_create();
+$result = xmlrpc_server_register_method($server, 'test1', 'test1');
+$HTTP_RAW_POST_DATA = <<
+
+test1
+
+
+EOD;
+$response = xmlrpc_server_call_method($server, $HTTP_RAW_POST_DATA, null);
+var_dump(xmlrpc_decode($response));
+
+// 
+
+$server = xmlrpc_server_create();
+$result = xmlrpc_server_register_method($server, 'test2', 'test2');
+$HTTP_RAW_POST_DATA = <<
+
+test2
+
+
+EOD;
+$response = xmlrpc_server_call_method($server, $HTTP_RAW_POST_DATA, null);
+var_dump(xmlrpc_decode($response));
+
+// 
+
+$server = xmlrpc_server_create();
+$result = xmlrpc_server_register_method($server, 'test3', 'test3');
+$HTTP_RAW_POST_DATA = <<
+
+test3
+
+
+EOD;
+$response = xmlrpc_server_call_method($server, $HTTP_RAW_POST_DATA, null);
+var_dump(xmlrpc_decode($response));
+
+// 
+
+$server = xmlrpc_server_create();
+$result = xmlrpc_server_register_method($server, 'test4', 'test4');
+$HTTP_RAW_POST_DATA = <<
+
+test4
+
+
+EOD;
+$response = xmlrpc_server_call_method($server, $HTTP_RAW_POST_DATA, null);
+var_dump(xmlrpc_decode($response));
+
+?>
+--EXPECT--
+array(3) {
+  [1]=>
+  string(3) "One"
+  [3]=>
+  string(5) "Three"
+  [5]=>
+  string(4) "Five"
+}
+array(4) {
+  [0]=>
+  string(3) "One"
+  [1]=>
+  string(5) "Three"
+  [2]=>
+  string(4) "Five"
+  [3]=>
+  int(5)
+}
+array(4) {
+  [0]=>
+  string(3) "One"
+  [3]=>
+  string(5) "Three"
+  ["Five"]=>
+  int(5)
+  [4]=>
+  string(3) "Six"
+}
+array(4) {
+  [0]=>
+  string(3) "One"
+  [1]=>
+  string(5) "Three"
+  [2]=>
+  string(4) "Five"
+  ["Six"]=>
+  int(6)
+}


Property changes on: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50285.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c
===
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c	2009-11-25 01:36:41 UTC (rev 291284)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c	2009-11-25 02:03:02 UTC (rev 291285)
@@ -428,7 +428,7 @@
 static XMLRPC_VECTOR_TYPE determine_vector_type (HashTable *ht)
 {
 	int bArray = 0, bStruct = 0, bMixed = 0;
-	unsigned long num_index;
+	unsigned long num_index, last_num = 0;
 	char* my_key;

 	zend_hash_internal_pointer_reset(ht);
@@ -438,8 +438,12 @@
 			if(bStruct) {
 bMixed = 1;
 break;
+			} else if (last_num > 0 && last_num != num_index-1) {
+bStruct = 1;
+break;
 			}
 			bArray = 1;
+			last_num = num_index;
 		}
 		else if(res == HASH_KEY_NON_EXISTANT) {
 			break;
@@ -500,6 +504,7 @@
 	char* my_key;
 	HashTable *ht = NULL;
 	zval *val_arr;
+	XMLRPC_VECTOR_TYPE vtype;

 	ht 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/config.m4 branches/PHP_5_2/scripts/phpize.m4 branches/PHP_5_3/ext/standard/config.m4 branches/PHP_5_3/scripts/phpize.m4 trunk/ext/standard/co

2009-11-24 Thread Rasmus Lerdorf
rasmus   Wed, 25 Nov 2009 01:36:41 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291284

Log:
Missed a few - now it really works with autoconf-2.64+

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/standard/config.m4
U   php/php-src/branches/PHP_5_2/scripts/phpize.m4
U   php/php-src/branches/PHP_5_3/ext/standard/config.m4
U   php/php-src/branches/PHP_5_3/scripts/phpize.m4
U   php/php-src/trunk/ext/standard/config.m4
U   php/php-src/trunk/scripts/phpize.m4

Modified: php/php-src/branches/PHP_5_2/ext/standard/config.m4
===
--- php/php-src/branches/PHP_5_2/ext/standard/config.m4 2009-11-25 01:30:06 UTC 
(rev 291283)
+++ php/php-src/branches/PHP_5_2/ext/standard/config.m4 2009-11-25 01:36:41 UTC 
(rev 291284)
@@ -1,6 +1,6 @@
 dnl $Id$ -*- autoconf -*-

-divert(3)dnl
+divert(1003)dnl

 dnl
 dnl Check if flush should be called explicitly after buffered io
@@ -205,7 +205,7 @@
 AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice 
fpclass isinf isnan)
 AC_FUNC_FNMATCH

-divert(5)dnl
+divert(1005)dnl

 dnl
 dnl Check for regex library type

Modified: php/php-src/branches/PHP_5_2/scripts/phpize.m4
===
--- php/php-src/branches/PHP_5_2/scripts/phpize.m4  2009-11-25 01:30:06 UTC 
(rev 291283)
+++ php/php-src/branches/PHP_5_2/scripts/phpize.m4  2009-11-25 01:36:41 UTC 
(rev 291284)
@@ -1,6 +1,6 @@
 dnl This file becomes configure.in for self-contained extensions.

-divert(1)
+divert(1001)

 AC_PREREQ(2.13)
 AC_INIT(config.m4)

Modified: php/php-src/branches/PHP_5_3/ext/standard/config.m4
===
--- php/php-src/branches/PHP_5_3/ext/standard/config.m4 2009-11-25 01:30:06 UTC 
(rev 291283)
+++ php/php-src/branches/PHP_5_3/ext/standard/config.m4 2009-11-25 01:36:41 UTC 
(rev 291284)
@@ -1,6 +1,6 @@
 dnl $Id$ -*- autoconf -*-

-divert(3)dnl
+divert(1003)dnl

 dnl
 dnl Check if flush should be called explicitly after buffered io
@@ -220,7 +220,7 @@
 AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice 
fpclass isinf isnan)
 AC_FUNC_FNMATCH

-divert(5)dnl
+divert(1005)dnl

 dnl
 dnl Check if there is a support means of creating a new process

Modified: php/php-src/branches/PHP_5_3/scripts/phpize.m4
===
--- php/php-src/branches/PHP_5_3/scripts/phpize.m4  2009-11-25 01:30:06 UTC 
(rev 291283)
+++ php/php-src/branches/PHP_5_3/scripts/phpize.m4  2009-11-25 01:36:41 UTC 
(rev 291284)
@@ -1,6 +1,6 @@
 dnl This file becomes configure.in for self-contained extensions.

-divert(1)
+divert(1001)

 AC_PREREQ(2.13)
 AC_INIT(config.m4)

Modified: php/php-src/trunk/ext/standard/config.m4
===
--- php/php-src/trunk/ext/standard/config.m42009-11-25 01:30:06 UTC (rev 
291283)
+++ php/php-src/trunk/ext/standard/config.m42009-11-25 01:36:41 UTC (rev 
291284)
@@ -1,6 +1,6 @@
 dnl $Id$ -*- autoconf -*-

-divert(3)dnl
+divert(1003)dnl

 dnl
 dnl Check if flush should be called explicitly after buffered io
@@ -220,7 +220,7 @@
 AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice 
fpclass isinf isnan)
 AC_FUNC_FNMATCH

-divert(5)dnl
+divert(1005)dnl

 dnl
 dnl Check if there is a support means of creating a new process

Modified: php/php-src/trunk/scripts/phpize.m4
===
--- php/php-src/trunk/scripts/phpize.m4 2009-11-25 01:30:06 UTC (rev 291283)
+++ php/php-src/trunk/scripts/phpize.m4 2009-11-25 01:36:41 UTC (rev 291284)
@@ -1,6 +1,6 @@
 dnl This file becomes configure.in for self-contained extensions.

-divert(1)
+divert(1001)

 AC_PREREQ(2.13)
 AC_INIT(config.m4)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/Zend/tests/bug50255.phpt branches/PHP_5_2/Zend/zend_vm_def.h branches/PHP_5_2/Zend/zend_vm_execute.h branches/PHP_5_3/NEWS branches/

2009-11-24 Thread Felipe Pena
felipe   Tue, 24 Nov 2009 21:54:12 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291282

Log:
- Fixed bug #50255 (isset() and empty() silently casts array to object)

Bug: http://bugs.php.net/50255 (Closed) isset() and empty() silently casts 
array to object
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
A   php/php-src/branches/PHP_5_2/Zend/tests/bug50255.phpt
U   php/php-src/branches/PHP_5_2/Zend/zend_vm_def.h
U   php/php-src/branches/PHP_5_2/Zend/zend_vm_execute.h
U   php/php-src/branches/PHP_5_3/NEWS
A   php/php-src/branches/PHP_5_3/Zend/tests/bug50255.phpt
U   php/php-src/branches/PHP_5_3/Zend/zend_vm_def.h
U   php/php-src/branches/PHP_5_3/Zend/zend_vm_execute.h
A   php/php-src/trunk/Zend/tests/bug50255.phpt
U   php/php-src/trunk/Zend/zend_vm_def.h
U   php/php-src/trunk/Zend/zend_vm_execute.h

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS	2009-11-24 20:10:19 UTC (rev 291281)
+++ php/php-src/branches/PHP_5_2/NEWS	2009-11-24 21:54:12 UTC (rev 291282)
@@ -12,6 +12,8 @@

 - Fixed bug #50282 (xmlrpc_encode_request() changes object into array in
   calling function). (Felipe)
+- Fixed bug #50255 (isset() and empty() silently casts array to object).
+  (Felipe)
 - Fixed bug #50219 (soap call Segmentation fault on a redirected url).
   (Pierrick)
 - Fixed bug #50207 (segmentation fault when concatenating very large strings

Added: php/php-src/branches/PHP_5_2/Zend/tests/bug50255.phpt
===
--- php/php-src/branches/PHP_5_2/Zend/tests/bug50255.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_2/Zend/tests/bug50255.phpt	2009-11-24 21:54:12 UTC (rev 291282)
@@ -0,0 +1,30 @@
+--TEST--
+Bug #50255 (isset() and empty() silently casts array to object)
+--FILE--
+ 'bar');
+
+print "isset\n";
+var_dump(isset($arr->foo));
+var_dump(isset($arr->bar));
+var_dump(isset($arr['foo']));
+var_dump(isset($arr['bar']));
+print "empty\n";
+var_dump(empty($arr->foo));
+var_dump(empty($arr->bar));
+var_dump(empty($arr['foo']));
+var_dump(empty($arr['bar']));
+
+?>
+--EXPECT--
+isset
+bool(false)
+bool(false)
+bool(true)
+bool(false)
+empty
+bool(true)
+bool(true)
+bool(false)
+bool(true)


Property changes on: php/php-src/branches/PHP_5_2/Zend/tests/bug50255.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_2/Zend/zend_vm_def.h
===
--- php/php-src/branches/PHP_5_2/Zend/zend_vm_def.h	2009-11-24 20:10:19 UTC (rev 291281)
+++ php/php-src/branches/PHP_5_2/Zend/zend_vm_def.h	2009-11-24 21:54:12 UTC (rev 291282)
@@ -3532,7 +3532,7 @@
 		zend_free_op free_op2;
 		zval *offset = GET_OP2_ZVAL_PTR(BP_VAR_R);

-		if (Z_TYPE_PP(container) == IS_ARRAY) {
+		if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
 			HashTable *ht;
 			int isset = 0;


Modified: php/php-src/branches/PHP_5_2/Zend/zend_vm_execute.h
===
--- php/php-src/branches/PHP_5_2/Zend/zend_vm_execute.h	2009-11-24 20:10:19 UTC (rev 291281)
+++ php/php-src/branches/PHP_5_2/Zend/zend_vm_execute.h	2009-11-24 21:54:12 UTC (rev 291282)
@@ -9750,7 +9750,7 @@

 		zval *offset = &opline->op2.u.constant;

-		if (Z_TYPE_PP(container) == IS_ARRAY) {
+		if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
 			HashTable *ht;
 			int isset = 0;

@@ -11283,7 +11283,7 @@
 		zend_free_op free_op2;
 		zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);

-		if (Z_TYPE_PP(container) == IS_ARRAY) {
+		if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
 			HashTable *ht;
 			int isset = 0;

@@ -12864,7 +12864,7 @@
 		zend_free_op free_op2;
 		zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);

-		if (Z_TYPE_PP(container) == IS_ARRAY) {
+		if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
 			HashTable *ht;
 			int isset = 0;

@@ -14890,7 +14890,7 @@

 		zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);

-		if (Z_TYPE_PP(container) == IS_ARRAY) {
+		if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
 			HashTable *ht;
 			int isset = 0;

@@ -16009,7 +16009,7 @@

 		zval *offset = &opline->op2.u.constant;

-		if (Z_TYPE_PP(container) == IS_ARRAY) {
+		if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
 			HashTable *ht;
 			int isset = 0;

@@ -17002,7 +17002,7 @@
 		zend_free_op free_op2;
 		zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);

-		if (Z_TYPE_PP(container) == IS_ARRAY) {
+		if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
 			HashTable *ht;
 			int isset = 0;

@@ -17995,7 +17995,7 @@
 		zend_free_op free_op2;
 		zval *offset = _get

[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_3/NEWS

2009-11-24 Thread Jani Taskinen
jani Tue, 24 Nov 2009 14:14:13 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291266

Log:
- Fix news

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-11-24 13:59:56 UTC (rev 291265)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-11-24 14:14:13 UTC (rev 291266)
@@ -3,13 +3,13 @@
 ?? Nov 2009, PHP 5.2.12RC2
 - Updated timezone database to version 2009.19 (2009s). (Derick)

+- Changed gmp_strval() to use full range from 2 to 62, and -2 to -36. FR #50283
+  (David Soria Parra)
 - Changed "post_max_size" php.ini directive to allow unlimited post size by
   setting it to 0. (Rasmus)

 - Fixed error_log() to be binary safe when using message_type 3. (Jani)

-- Implement feature request #50283 (allow base in gmp_strval to use full
-  range: 2 to 62, and -2 to -36). (David Soria Parra)
 - Fixed bug #50282 (xmlrpc_encode_request() changes object into array in
   calling function). (Felipe)
 - Fixed bug #50219 (soap call Segmentation fault on a redirected url).

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-11-24 13:59:56 UTC (rev 291265)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-11-24 14:14:13 UTC (rev 291266)
@@ -4,6 +4,8 @@
 - Upgraded bundled sqlite to version 3.6.20. (Ilia)
 - Upgraded bundled PCRE to version 8.00. (Scott)

+- Changed gmp_strval() to use full range from 2 to 62, and -2 to -36. FR #50283
+  (David Soria Parra)
 - Changed "post_max_size" php.ini directive to allow unlimited post size by
   setting it to 0. (Rasmus)


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/gmp/gmp.c branches/PHP_5_2/ext/gmp/tests/bug50283.phpt branches/PHP_5_3/ext/gmp/gmp.c branches/PHP_5_3/ext/gmp/tests/bug50

2009-11-24 Thread David Soria Parra



PHP_5_2 is a bug fix branch, was it approved by Ilia?


yes



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c trunk/ext/mysqlnd/mysqlnd_charset.c

2009-11-24 Thread Andrey Hristov
andrey   Tue, 24 Nov 2009 13:59:56 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291265

Log:
Update charset table

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_charset.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c	2009-11-24 13:57:39 UTC (rev 291264)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c	2009-11-24 13:59:56 UTC (rev 291265)
@@ -316,7 +316,7 @@
 	{  28, "gbk", "gbk_chinese_ci", 1, 2, "", mysqlnd_mbcharlen_gbk, check_mb_gbk},
 	{  30, "latin5", "latin5_turkish_ci", 1, 1, "", NULL, NULL},
 	{  32, "armscii8", "armscii8_general_ci", 1, 1, "", NULL, NULL},
-	{  33, "utf8", "utf8_general_ci", 1, 2, "UTF-8 Unicode", mysqlnd_mbcharlen_utf8,  check_mb_utf8_valid},
+	{  33, "utf8", "utf8_general_ci", 1, 3, "UTF-8 Unicode", mysqlnd_mbcharlen_utf8,  check_mb_utf8_valid},
 	{  35, "ucs2", "ucs2_general_ci", 2, 2, "UCS-2 Unicode", mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
 	{  36, "cp866", "cp866_general_ci", 1, 1, "", NULL, NULL},
 	{  37, "keybcs2", "keybcs2_general_ci", 1, 1, "", NULL, NULL},
@@ -372,7 +372,7 @@
 	{  81, "cp852", "cp852_bin", 1, 1, "", NULL, NULL},
 	{  82, "swe7", "swe7_bin", 1, 1, "", NULL, NULL},
 	{  93, "geostd8", "geostd8_bin", 1, 1, "", NULL, NULL},
-	{  83, "utf8", "utf8_bin", 1, 2, "UTF-8 Unicode", mysqlnd_mbcharlen_utf8,  check_mb_utf8_valid},
+	{  83, "utf8", "utf8_bin", 1, 3, "UTF-8 Unicode", mysqlnd_mbcharlen_utf8,  check_mb_utf8_valid},
 	{  84, "big5", "big5_bin", 1, 2, "", mysqlnd_mbcharlen_big5, check_mb_big5},
 	{  85, "euckr", "euckr_bin", 1, 2, "", mysqlnd_mbcharlen_euckr, check_mb_euckr},
 	{  86, "gb2312", "gb2312_bin", 1, 2, "", mysqlnd_mbcharlen_gb2312, check_mb_gb2312},
@@ -424,7 +424,47 @@
 	{ 208, "utf8", "utf8_persian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
 	{ 209, "utf8", "utf8_esperanto_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
 	{ 210, "utf8", "utf8_hungarian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
-	{ 254, "utf8", "utf8_general_cs", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 192, "utf8mb3", "utf8mb3_general_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 193, "utf8mb3", "utf8mb3_icelandic_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 194, "utf8mb3", "utf8mb3_latvian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8,  check_mb_utf8_valid},
+	{ 195, "utf8mb3", "utf8mb3_romanian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 196, "utf8mb3", "utf8mb3_slovenian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 197, "utf8mb3", "utf8mb3_polish_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 198, "utf8mb3", "utf8mb3_estonian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 119, "utf8mb3", "utf8mb3_spanish_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 200, "utf8mb3", "utf8mb3_swedish_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 201, "utf8mb3", "utf8mb3_turkish_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 202, "utf8mb3", "utf8mb3_czech_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 203, "utf8mb3", "utf8mb3_danish_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid },
+	{ 204, "utf8mb3", "utf8mb3_lithunian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid },
+	{ 205, "utf8mb3", "utf8mb3_slovak_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 206, "utf8mb3", "utf8mb3_spanish2_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 207, "utf8mb3", "utf8mb3_roman_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 208, "utf8mb3", "utf8mb3_persian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 209, "utf8mb3", "utf8mb3_esperanto_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 210, "utf8mb3", "utf8mb3_hungarian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 211, "utf8mb3", "utf8mb3_sinhala_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 224, "utf8", "utf8_unicode_ci", 1, 4, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 225, "utf8", "utf8_icelandic_ci", 1, 4, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 226, "utf8", "utf8_latvian_ci", 1, 4, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 227, "utf8", "utf8_romanian_ci", 1, 4, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 228, "utf8", "utf8_slovenian_ci", 1, 4, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 229, "utf8", "utf8_polish_ci", 1, 4, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 230, "utf8", "utf8_estonian_ci", 1, 4, "", mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 231, "utf8", "utf8_spanish_ci", 1, 4, ""

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/ftp/ftp.c branches/PHP_5_3/ext/ftp/ftp.c trunk/ext/ftp/ftp.c

2009-11-24 Thread Rasmus Lerdorf
rasmus   Tue, 24 Nov 2009 13:57:39 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291264

Log:
Fix null deref found by Michael Maclean

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/ftp/ftp.c
U   php/php-src/branches/PHP_5_3/ext/ftp/ftp.c
U   php/php-src/trunk/ext/ftp/ftp.c

Modified: php/php-src/branches/PHP_5_2/ext/ftp/ftp.c
===
--- php/php-src/branches/PHP_5_2/ext/ftp/ftp.c  2009-11-24 13:51:53 UTC (rev 
291263)
+++ php/php-src/branches/PHP_5_2/ext/ftp/ftp.c  2009-11-24 13:57:39 UTC (rev 
291264)
@@ -1699,7 +1699,7 @@
chararg[11];

if (ftp == NULL) {
-   goto bail;
+   return PHP_FTP_FAILED;
}

if (!ftp_type(ftp, type)) {

Modified: php/php-src/branches/PHP_5_3/ext/ftp/ftp.c
===
--- php/php-src/branches/PHP_5_3/ext/ftp/ftp.c  2009-11-24 13:51:53 UTC (rev 
291263)
+++ php/php-src/branches/PHP_5_3/ext/ftp/ftp.c  2009-11-24 13:57:39 UTC (rev 
291264)
@@ -1699,7 +1699,7 @@
chararg[11];

if (ftp == NULL) {
-   goto bail;
+   return PHP_FTP_FAILED;
}

if (!ftp_type(ftp, type)) {

Modified: php/php-src/trunk/ext/ftp/ftp.c
===
--- php/php-src/trunk/ext/ftp/ftp.c 2009-11-24 13:51:53 UTC (rev 291263)
+++ php/php-src/trunk/ext/ftp/ftp.c 2009-11-24 13:57:39 UTC (rev 291264)
@@ -1700,7 +1700,7 @@
chararg[11];

if (ftp == NULL) {
-   goto bail;
+   return PHP_FTP_FAILED;
}

if (!ftp_type(ftp, type)) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/gmp/gmp.c branches/PHP_5_2/ext/gmp/tests/bug50283.phpt branches/PHP_5_3/ext/gmp/gmp.c branches/PHP_5_3/ext/gmp/tests/bug50

2009-11-24 Thread Kalle Sommer Nielsen
Hi

2009/11/24 David Soria Parra :
> dsp                                      Tue, 24 Nov 2009 13:33:35 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=291262
>
> Log:
> Implement feature request #50283 (allow base in gmp_strval to use full range: 
> 2 to 62, and -2 to -36)

PHP_5_2 is a bug fix branch, was it approved by Ilia?


-- 
regrads,

Kalle Sommer Nielsen
ka...@php.net

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ EXTENSIONS

2009-11-24 Thread Ilia Alshanetsky
iliaaTue, 24 Nov 2009 13:51:53 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291263

Log:
Add myself as pdo_pgsql maintainer

Changed paths:
U   php/php-src/branches/PHP_5_2/EXTENSIONS

Modified: php/php-src/branches/PHP_5_2/EXTENSIONS
===
--- php/php-src/branches/PHP_5_2/EXTENSIONS 2009-11-24 13:33:35 UTC (rev 
291262)
+++ php/php-src/branches/PHP_5_2/EXTENSIONS 2009-11-24 13:51:53 UTC (rev 
291263)
@@ -206,7 +206,7 @@
 SINCE:   5.1
 ---
 EXTENSION:   pdo_pgsql
-PRIMARY MAINTAINER:  Unknown
+PRIMARY MAINTAINER:  Ilia Alshanetsky 
 MAINTENANCE: Odd fixes
 STATUS:  Working
 SINCE:   5.1

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/gmp/gmp.c branches/PHP_5_2/ext/gmp/tests/bug50283.phpt branches/PHP_5_3/ext/gmp/gmp.c branches/PHP_5_3/ext/gmp/tests/bug50283.ph

2009-11-24 Thread David Soria Parra
dsp  Tue, 24 Nov 2009 13:33:35 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291262

Log:
Implement feature request #50283 (allow base in gmp_strval to use full range: 2 
to 62, and -2 to -36)

Bug: http://bugs.php.net/50283 (Open) allow base in gmp_strval to use full 
range: 2 to 62, and -2 to -36
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/gmp/gmp.c
A   php/php-src/branches/PHP_5_2/ext/gmp/tests/bug50283.phpt
U   php/php-src/branches/PHP_5_3/ext/gmp/gmp.c
A   php/php-src/branches/PHP_5_3/ext/gmp/tests/bug50283.phpt
U   php/php-src/trunk/ext/gmp/gmp.c
A   php/php-src/trunk/ext/gmp/tests/bug50283.phpt

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-11-24 12:19:56 UTC (rev 291261)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-11-24 13:33:35 UTC (rev 291262)
@@ -8,6 +8,8 @@

 - Fixed error_log() to be binary safe when using message_type 3. (Jani)

+- Implement feature request #50283 (allow base in gmp_strval to use full
+  range: 2 to 62, and -2 to -36). (David Soria Parra)
 - Fixed bug #50282 (xmlrpc_encode_request() changes object into array in
   calling function). (Felipe)
 - Fixed bug #50219 (soap call Segmentation fault on a redirected url).

Modified: php/php-src/branches/PHP_5_2/ext/gmp/gmp.c
===
--- php/php-src/branches/PHP_5_2/ext/gmp/gmp.c  2009-11-24 12:19:56 UTC (rev 
291261)
+++ php/php-src/branches/PHP_5_2/ext/gmp/gmp.c  2009-11-24 13:33:35 UTC (rev 
291262)
@@ -817,12 +817,12 @@
break;
}

-   if (base < 2 || base > 36) {
+   if ((base < 2 && base > -2) || base > 36 || base < -36) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for 
conversion: %d", base);
RETURN_FALSE;
}

-   num_len = mpz_sizeinbase(*gmpnum, base);
+   num_len = mpz_sizeinbase(*gmpnum, abs(base));
out_string = emalloc(num_len+2);
if (mpz_sgn(*gmpnum) < 0) {
num_len++;

Added: php/php-src/branches/PHP_5_2/ext/gmp/tests/bug50283.phpt
===
--- php/php-src/branches/PHP_5_2/ext/gmp/tests/bug50283.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/gmp/tests/bug50283.phpt2009-11-24 
13:33:35 UTC (rev 291262)
@@ -0,0 +1,29 @@
+--TEST--
+Feature Request #50283 (allow base in gmp_strval to use full range: 2 to 62, 
and -2 to -36)
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+Decimal: 71915494046709, 36-based: PHPISCOOL
+Decimal: 71915494046709, 36-based: phpiscool
+
+Warning: gmp_strval(): Bad base for conversion: -1 in %s on line 5
+Decimal: 71915494046709, 36-based:
+
+Warning: gmp_strval(): Bad base for conversion: 1 in %s on line 6
+Decimal: 71915494046709, 36-based:
+
+Warning: gmp_strval(): Bad base for conversion: -37 in %s on line 7
+Decimal: 71915494046709, 36-based:
+
+Warning: gmp_strval(): Bad base for conversion: 37 in %s on line 8
+Decimal: 71915494046709, 36-based:

Modified: php/php-src/branches/PHP_5_3/ext/gmp/gmp.c
===
--- php/php-src/branches/PHP_5_3/ext/gmp/gmp.c  2009-11-24 12:19:56 UTC (rev 
291261)
+++ php/php-src/branches/PHP_5_3/ext/gmp/gmp.c  2009-11-24 13:33:35 UTC (rev 
291262)
@@ -796,14 +796,14 @@
return;
}

-   if (base < 2 || base > 36) {
+   if ((base < 2 && base > -2) || base > 36 || base < -36) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for 
conversion: %ld", base);
RETURN_FALSE;
}

FETCH_GMP_ZVAL(gmpnum, gmpnumber_arg, temp_a);

-   num_len = mpz_sizeinbase(*gmpnum, base);
+   num_len = mpz_sizeinbase(*gmpnum, abs(base));
out_string = emalloc(num_len+2);
if (mpz_sgn(*gmpnum) < 0) {
num_len++;

Added: php/php-src/branches/PHP_5_3/ext/gmp/tests/bug50283.phpt
===
--- php/php-src/branches/PHP_5_3/ext/gmp/tests/bug50283.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/gmp/tests/bug50283.phpt2009-11-24 
13:33:35 UTC (rev 291262)
@@ -0,0 +1,29 @@
+--TEST--
+Feature Request #50283 (allow base in gmp_strval to use full range: 2 to 62, 
and -2 to -36)
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+Decimal: 71915494046709, 36-based: PHPISCOOL
+Decimal: 71915494046709, 36-based: phpiscool
+
+Warning: gmp_strval(): Bad base for conversion: -1 in %s on line 5
+Decimal: 71915494046709, 36-based:
+
+Warning: gmp_strval(): Bad base for conversion: 1 in %s on line 6
+Decimal: 71915494046709, 36-based:
+
+Warning: gmp_strval(): Bad base for conversion: -37 in %s on line 7
+Decimal: 71915494046709, 36-based:
+
+Warning: g

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/xmlrpc/tests/bug50282.phpt branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/xmlrpc/tests/

2009-11-24 Thread Felipe Pena
felipe   Tue, 24 Nov 2009 11:32:31 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291260

Log:
- Fixed bug #50282 (xmlrpc_encode_request() changes object into array in 
calling function)

Bug: http://bugs.php.net/50282 (Open) xmlrpc_encode_request() changes object 
into array in calling function
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
A   php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50282.phpt
U   php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c
U   php/php-src/branches/PHP_5_3/NEWS
A   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug50282.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c
A   php/php-src/trunk/ext/xmlrpc/tests/bug50282.phpt
U   php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS	2009-11-24 11:08:16 UTC (rev 291259)
+++ php/php-src/branches/PHP_5_2/NEWS	2009-11-24 11:32:31 UTC (rev 291260)
@@ -8,6 +8,8 @@

 - Fixed error_log() to be binary safe when using message_type 3. (Jani)

+- Fixed bug #50282 (xmlrpc_encode_request() changes object into array in
+  calling function). (Felipe)
 - Fixed bug #50219 (soap call Segmentation fault on a redirected url).
   (Pierrick)
 - Fixed bug #50207 (segmentation fault when concatenating very large strings

Added: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50282.phpt
===
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50282.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50282.phpt	2009-11-24 11:32:31 UTC (rev 291260)
@@ -0,0 +1,43 @@
+--TEST--
+Bug #50282 (xmlrpc_encode_request() changes object into array in calling function)
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+object(One)#%d (1) {
+  ["x"]=>
+  int(10)
+}
+string(279) "
+
+test
+
+ 
+  
+   
+
+ x
+ 
+  10
+ 
+
+   
+  
+ 
+
+
+"
+object(One)#%d (1) {
+  ["x"]=>
+  int(10)
+}


Property changes on: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50282.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c
===
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c	2009-11-24 11:08:16 UTC (rev 291259)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c	2009-11-24 11:32:31 UTC (rev 291260)
@@ -499,6 +499,7 @@
 	zval** pIter;
 	char* my_key;
 	HashTable *ht = NULL;
+	zval *val_arr;

 	ht = HASH_OF(val);
 	if (ht && ht->nApplyCount > 1) {
@@ -506,12 +507,16 @@
 		return NULL;
 	}

-	convert_to_array(val);
-	xReturn = XMLRPC_CreateVector(key, determine_vector_type(Z_ARRVAL_P(val)));
+	MAKE_STD_ZVAL(val_arr);
+	*val_arr = *val;
+	zval_copy_ctor(val_arr);
+	INIT_PZVAL(val_arr);
+	convert_to_array(val_arr);
+	xReturn = XMLRPC_CreateVector(key, determine_vector_type(Z_ARRVAL_P(val_arr)));

-	zend_hash_internal_pointer_reset(Z_ARRVAL_P(val));
-	while(zend_hash_get_current_data(Z_ARRVAL_P(val), (void**)&pIter) == SUCCESS) {
-		int res = my_zend_hash_get_current_key(Z_ARRVAL_P(val), &my_key, &num_index);
+	zend_hash_internal_pointer_reset(Z_ARRVAL_P(val_arr));
+	while(zend_hash_get_current_data(Z_ARRVAL_P(val_arr), (void**)&pIter) == SUCCESS) {
+		int res = my_zend_hash_get_current_key(Z_ARRVAL_P(val_arr), &my_key, &num_index);

 		switch (res) {
 			case HASH_KEY_NON_EXISTANT:
@@ -532,8 +537,9 @@
 }
 break;
 		}
-		zend_hash_move_forward(Z_ARRVAL_P(val));
+		zend_hash_move_forward(Z_ARRVAL_P(val_arr));
 	}
+	zval_ptr_dtor(&val_arr);
 }
 break;
 			default:

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2009-11-24 11:08:16 UTC (rev 291259)
+++ php/php-src/branches/PHP_5_3/NEWS	2009-11-24 11:32:31 UTC (rev 291260)
@@ -24,6 +24,8 @@
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)

+- Fixed bug #50282 (xmlrpc_encode_request() changes object into array in
+  calling function). (Felipe)
 - Fixed bug #50267 (get_browser(null) does not use HTTP_USER_AGENT). (Jani)
 - Fixed bug #50240 (pdo_mysql.default_socket in php.ini shouldn't used
   if it is empty). (foutrelis at gmail dot com, Ilia)

Added: php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug50282.phpt
===
--- php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug50282.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug50282.phpt	2009-11-24 11:32

[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ string.c

2009-11-24 Thread Kalle Sommer Nielsen
kalleTue, 24 Nov 2009 11:08:16 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291259

Log:
Fixed #50226 (Insufficient memory allocation for unicode string)
 - Patch by yoarvi at gmail dot com

Bug: http://bugs.php.net/50226 (Open) [PATCH] - Insufficient memory allocation 
for unicode string
  
Changed paths:
U   php/php-src/trunk/ext/standard/string.c

Modified: php/php-src/trunk/ext/standard/string.c
===
--- php/php-src/trunk/ext/standard/string.c 2009-11-24 11:02:47 UTC (rev 
291258)
+++ php/php-src/trunk/ext/standard/string.c 2009-11-24 11:08:16 UTC (rev 
291259)
@@ -3457,7 +3457,7 @@

if (type == IS_UNICODE) {
old_end.u = old.u + old_len;
-   str.u = safe_emalloc(2, UBYTES(old_len), 1);
+   str.u = safe_emalloc(2, UBYTES(old_len), UBYTES(1));

for (p.u = old.u, q.u = str.u; p.u != old_end.u; p.u++) {
cp = *p.u;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2009-11-24 Thread Derick Rethans
derick   Tue, 24 Nov 2009 09:31:19 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291254

Log:
- pecl/apm karma for Patrick and Davide.

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2009-11-24 02:52:35 UTC (rev 291253)
+++ SVNROOT/global_avail2009-11-24 09:31:19 UTC (rev 291254)
@@ -310,6 +310,7 @@
 avail|pierrick|pecl/stomp,phpdoc
 avail|cataphract|pecl/rar,phpdoc
 avail|cyberspice|pecl/dio,phpdoc
+avail|dmendolia,patrickallaert|pecl/apm,phpdoc

 # Objective-C bridge
 avail|wez,jan|php/php-objc

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php