[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Nov 28 01:32:24 2008 UTC
Modified files:
/php-srcChangeLog
Log:
ChangeLog update
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3241r2=1.3242diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3241 php-src/ChangeLog:1.3242
--- php-src/ChangeLog:1.3241Thu Nov 27 01:32:20 2008
+++ php-src/ChangeLog Fri Nov 28 01:32:23 2008
@@ -1,3 +1,266 @@
+2008-11-27 Stanislav Malyshev [EMAIL PROTECTED]
+
+* (PHP_5_2)
+ NEWS:
+ report fix
+
+2008-11-27 Pierre-Alain Joye [EMAIL PROTECTED]
+
+* ext/hash/config.w32:
+ - fix build..
+
+2008-11-27 Ilia Alshanetsky [EMAIL PROTECTED]
+
+* (PHP_5_2)
+ NEWS
+ configure.in
+ main/php_version.h:
+ Back to dev
+
+* (PHP_5_2)
+ NEWS
+ configure.in
+ main/php_version.h:
+
+ 5.2.7RC5
+
+2008-11-27 Scott MacVicar [EMAIL PROTECTED]
+
+* (PHP_5_3)
+ ext/hash/hash.c
+ ext/mhash/CREDITS
+ ext/mhash/config.m4
+ ext/mhash/config.w32
+ ext/mhash/mhash.c
+ ext/mhash/php_mhash.h:
+ MFH Move mhash extension registration code into the hash module startup.
+ This allows extension_loaded('mhash'); to work.
+
+* ext/hash/hash.c
+ ext/mhash/CREDITS
+ ext/mhash/config.m4
+ ext/mhash/config.w32
+ ext/mhash/mhash.c
+ ext/mhash/php_mhash.h:
+ Move mhash extension registration code into the hash module startup. This
+ allows extension_loaded('mhash'); to work.
+
+* (PHP_5_3)
+ configure.in
+ ext/fileinfo/libmagic/print.c
+ main/snprintf.c
+ main/snprintf.h:
+ MFH Add asprintf, use regular system malloc and free and add checks in
+ configure.in for the functions
+
+* configure.in
+ ext/fileinfo/libmagic/print.c
+ main/snprintf.c
+ main/snprintf.h:
+ Add asprintf, use regular system malloc and free and add checks in
+ configure.in for the functions
+
+2008-11-27 Dmitry Stogov [EMAIL PROTECTED]
+
+* ZendEngine2/tests/bug46409.phpt
+ ZendEngine2/tests/bug46409.phpt
+ ext/curl/interface.c
+ ext/dom/xpath.c
+ ext/mysql/php_mysql.c
+ ext/mysqli/mysqli.c
+ ext/pdo/pdo_dbh.c
+ ext/pdo/pdo_stmt.c
+ ext/pdo_sqlite/sqlite_driver.c
+ ext/pgsql/pgsql.c
+ ext/reflection/php_reflection.c:
+
+ file bug46409.phpt was initially added on branch PHP_5_3.
+
+* (PHP_5_3)
+ NEWS
+ ZendEngine2/zend_API.c
+ ZendEngine2/zend_API.c
+ ZendEngine2/zend_API.h
+ ZendEngine2/zend_API.h
+ ZendEngine2/zend_closures.c
+ ZendEngine2/zend_closures.c
+ ZendEngine2/zend_closures.h
+ ZendEngine2/zend_exceptions.c
+ ZendEngine2/zend_exceptions.c
+ ZendEngine2/zend_execute_API.c
+ ZendEngine2/zend_execute_API.c
+ ZendEngine2/zend_interfaces.c
+ ZendEngine2/zend_interfaces.c
+ ZendEngine2/zend_object_handlers.c
+ ZendEngine2/zend_object_handlers.c
+ ZendEngine2/zend_object_handlers.h
+ ZendEngine2/zend_object_handlers.h
+ ZendEngine2/zend_vm_def.h
+ ZendEngine2/zend_vm_def.h
+ ZendEngine2/zend_vm_execute.h
+ ZendEngine2/zend_vm_execute.h
+ ZendEngine2/tests/bug46409.phpt
+ ext/curl/interface.c
+ ext/dom/xpath.c
+ ext/mysql/php_mysql.c
+ ext/mysqli/mysqli.c
+ ext/pdo/pdo_dbh.c
+ ext/pdo/pdo_stmt.c
+ ext/pdo_sqlite/sqlite_driver.c
+ ext/pgsql/pgsql.c
+ ext/reflection/php_reflection.c
+ ext/soap/soap.c
+ ext/soap/soap.c
+ ext/spl/php_spl.c
+ ext/spl/php_spl.c
+ ext/spl/spl_directory.c
+ ext/spl/spl_directory.c
+ ext/sqlite/sqlite.c
+ ext/sqlite/sqlite.c
+ ext/sqlite3/sqlite3.c
+ ext/sqlite3/sqlite3.c
+ ext/xml/xml.c
+ ext/xml/xml.c
+ ext/xsl/xsltprocessor.c
+ ext/xsl/xsltprocessor.c
+ main/streams/userspace.c
+ main/streams/userspace.c:
+ Fixed bug #46409 (__invoke method called outside of object context when
+ using array_map)
+
+2008-11-27 Ilia Alshanetsky [EMAIL PROTECTED]
+
+* (PHP_5_2)
+ NEWS:
+ Updated NEWS file with CVE #s
+
+* ext/curl/interface.c:
+ MFB: Fixed bug #46696 (cURL fails in upload files with specified
+ content-type)
+
+* (PHP_5_2)
+ NEWS
+ ext/curl/interface.c:
+
+ MFB: Fixed bug #46696 (cURL fails in upload files with specified
+ content-type)
+
+* (PHP_5_3)
+ ext/curl/interface.c:
+ Fixed bug #46696 (cURL fails in upload files with specified content-type)
+
+2008-11-27 Ant Phillips [EMAIL PROTECTED]
+
+* (PHP_5_2)
+ ext/standard/tests/directory/DirectoryClass_basic_001.phpt
+ ext/standard/tests/directory/DirectoryClass_basic_001.phpt
+ ext/standard/tests/directory/DirectoryClass_error_001.phpt
+ ext/standard/tests/directory/DirectoryClass_error_001.phpt
+
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Nov 28 01:32:29 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1406r2=1.1407diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1406 ZendEngine2/ChangeLog:1.1407 --- ZendEngine2/ChangeLog:1.1406Thu Nov 27 01:32:24 2008 +++ ZendEngine2/ChangeLog Fri Nov 28 01:32:28 2008 @@ -1,3 +1,35 @@ +2008-11-27 Dmitry Stogov [EMAIL PROTECTED] + +* zend_API.c + zend_API.c + zend_API.h + zend_API.h + zend_closures.c + zend_closures.c + zend_closures.h + zend_exceptions.c + zend_exceptions.c + zend_execute_API.c + zend_execute_API.c + zend_interfaces.c + zend_interfaces.c + zend_object_handlers.c + zend_object_handlers.c + zend_object_handlers.h + zend_object_handlers.h + zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h + tests/bug46409.phpt: + Fixed bug #46409 (__invoke method called outside of object context when + using array_map) + +* tests/bug46409.phpt + tests/bug46409.phpt: + + file bug46409.phpt was initially added on branch PHP_5_3. + 2008-11-26 Felipe Pena [EMAIL PROTECTED] * (PHP_5_3) @@ -26762,7 +26794,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1406 2008/11/27 01:32:24 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1407 2008/11/28 01:32:28 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -28486,7 +28518,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1406 2008/11/27 01:32:24 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1407 2008/11/28 01:32:28 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug46427.phpt
dmitry Thu Nov 27 11:25:23 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug46427.phpt
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #46427 (SoapClient() stumbles over its stream_context parameter)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1332r2=1.2027.2.547.2.1333diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1332 php-src/NEWS:1.2027.2.547.2.1333
--- php-src/NEWS:1.2027.2.547.2.1332Wed Nov 26 04:20:41 2008
+++ php-src/NEWSThu Nov 27 11:25:22 2008
@@ -9,6 +9,8 @@
inconsistent results). (Arnaud)
- Fixed bug #46626 (mb_convert_case does not handle apostrophe correctly).
(Ilia)
+- Fixed bug #46427 (SoapClient() stumbles over its stream_context parameter).
+ (Dmitry, Herman Radtke)
- Fixed bug #44182 (extract($a, EXTR_REFS) can fail to split copy-on-write
references). (robin_fernandes at uk dot ibm dot com)
- Fixed bug #44181 (extract($a, EXTR_OVERWRITE|EXTR_REFS) can fail to create
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.39r2=1.156.2.28.2.40diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.39
php-src/ext/soap/soap.c:1.156.2.28.2.40
--- php-src/ext/soap/soap.c:1.156.2.28.2.39 Tue Mar 4 12:23:10 2008
+++ php-src/ext/soap/soap.c Thu Nov 27 11:25:22 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.39 2008/03/04 12:23:10 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.40 2008/11/27 11:25:22 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2348,6 +2348,7 @@
if (zend_hash_find(ht, stream_context,
sizeof(stream_context), (void**)tmp) == SUCCESS
Z_TYPE_PP(tmp) == IS_RESOURCE) {
context = php_stream_context_from_zval(*tmp, 1);
+ zend_list_addref(context-rsrc_id);
}
if (zend_hash_find(ht, location, sizeof(location),
(void**)tmp) == SUCCESS
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug46427.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug46427.phpt
+++ php-src/ext/soap/tests/bugs/bug46427.phpt
--
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 soap.c /ext/soap/tests/bugs bug46427.phpt
dmitry Thu Nov 27 11:25:40 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/soap/tests/bugsbug46427.phpt
Modified files:
/php-src/ext/soap soap.c
Log:
Fixed bug #46427 (SoapClient() stumbles over its stream_context parameter)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.27r2=1.156.2.28.2.30.2.28diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.27
php-src/ext/soap/soap.c:1.156.2.28.2.30.2.28
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.27Mon Nov 17 11:27:58 2008
+++ php-src/ext/soap/soap.c Thu Nov 27 11:25:39 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.30.2.27 2008/11/17 11:27:58 felipe Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.28 2008/11/27 11:25:39 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2522,6 +2522,7 @@
if (zend_hash_find(ht, stream_context,
sizeof(stream_context), (void**)tmp) == SUCCESS
Z_TYPE_PP(tmp) == IS_RESOURCE) {
context = php_stream_context_from_zval(*tmp, 1);
+ zend_list_addref(context-rsrc_id);
}
if (zend_hash_find(ht, location, sizeof(location),
(void**)tmp) == SUCCESS
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug46427.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug46427.phpt
+++ php-src/ext/soap/tests/bugs/bug46427.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap soap.c /ext/soap/tests/bugs bug46427.phpt
dmitry Thu Nov 27 11:25:52 2008 UTC
Modified files:
/php-src/ext/soap soap.c
/php-src/ext/soap/tests/bugsbug46427.phpt
Log:
Fixed bug #46427 (SoapClient() stumbles over its stream_context parameter)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.255r2=1.256diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.255 php-src/ext/soap/soap.c:1.256
--- php-src/ext/soap/soap.c:1.255 Mon Nov 17 11:26:23 2008
+++ php-src/ext/soap/soap.c Thu Nov 27 11:25:52 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.255 2008/11/17 11:26:23 felipe Exp $ */
+/* $Id: soap.c,v 1.256 2008/11/27 11:25:52 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2862,6 +2862,7 @@
if (zend_ascii_hash_find(ht, stream_context,
sizeof(stream_context), (void**)tmp) == SUCCESS
Z_TYPE_PP(tmp) == IS_RESOURCE) {
context = php_stream_context_from_zval(*tmp, 1);
+ zend_list_addref(context-rsrc_id);
}
if (zend_ascii_hash_find(ht, location, sizeof(location),
(void**)tmp) == SUCCESS
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug46427.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug46427.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug46427.phpt:1.2
--- /dev/null Thu Nov 27 11:25:52 2008
+++ php-src/ext/soap/tests/bugs/bug46427.phpt Thu Nov 27 11:25:52 2008
@@ -0,0 +1,20 @@
+--TEST--
+Bug #46427 (SoapClient() stumbles over its stream_context parameter)
+--FILE--
+?php
+error_reporting(E_ALL|E_STRICT);
+
+function getSoapClient_1() {
+$ctx = stream_context_create();
+return new SoapClient(NULL, array(
+ 'stream_context' = $ctx,
+ 'location' = 'test://',
+ 'uri' = 'test://',
+ 'exceptions' = false));
+}
+
+getSoapClient_1()-__soapCall('Help', array());
+echo ok\n;
+?
+--EXPECT--
+ok
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session/tests session_module_name_variation3.phpt session_name_basic.phpt session_name_error.phpt session_name_variation1.phpt session_save_path_basic.phpt session_save_pat
ant Thu Nov 27 13:49:46 2008 UTC
Modified files:
/php-src/ext/session/tests session_name_variation1.phpt
session_name_basic.phpt
session_module_name_variation3.phpt
session_save_path_basic.phpt
session_save_path_variation4.phpt
session_set_save_handler_basic.phpt
session_save_path_error.phpt
session_name_error.phpt
session_save_path_variation1.phpt
Log:
Latest and greatest versions of these session tests - checked on 6.0 snap on
Windows, Linux and Linux 64 bit.
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_name_variation1.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/session/tests/session_name_variation1.phpt
diff -u php-src/ext/session/tests/session_name_variation1.phpt:1.4
php-src/ext/session/tests/session_name_variation1.phpt:1.5
--- php-src/ext/session/tests/session_name_variation1.phpt:1.4 Tue May 27
12:17:39 2008
+++ php-src/ext/session/tests/session_name_variation1.phpt Thu Nov 27
13:49:45 2008
@@ -41,6 +41,24 @@
?
--EXPECTF--
*** Testing session_name() : variation ***
+string(9) PHPSESSID
+bool(true)
+string(0)
+bool(true)
+string(0)
+string(0)
+bool(true)
+string(1)
+bool(true)
+string(1)
+string(1)
+bool(true)
+string(0)
+bool(true)
+string(0)
+Done
+--UEXPECTF--
+*** Testing session_name() : variation ***
unicode(9) PHPSESSID
bool(true)
unicode(0)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_name_basic.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/session/tests/session_name_basic.phpt
diff -u php-src/ext/session/tests/session_name_basic.phpt:1.4
php-src/ext/session/tests/session_name_basic.phpt:1.5
--- php-src/ext/session/tests/session_name_basic.phpt:1.4 Tue May 27
12:17:39 2008
+++ php-src/ext/session/tests/session_name_basic.phpt Thu Nov 27 13:49:45 2008
@@ -30,6 +30,15 @@
?
--EXPECTF--
*** Testing session_name() : error functionality ***
+string(9) PHPSESSID
+string(9) PHPSESSID
+bool(true)
+string(4) blah
+bool(true)
+string(4) blah
+Done
+--UEXPECTF--
+*** Testing session_name() : error functionality ***
unicode(9) PHPSESSID
unicode(9) PHPSESSID
bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_module_name_variation3.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/session/tests/session_module_name_variation3.phpt
diff -u php-src/ext/session/tests/session_module_name_variation3.phpt:1.4
php-src/ext/session/tests/session_module_name_variation3.phpt:1.5
--- php-src/ext/session/tests/session_module_name_variation3.phpt:1.4 Tue May
27 12:17:39 2008
+++ php-src/ext/session/tests/session_module_name_variation3.phpt Thu Nov
27 13:49:45 2008
@@ -38,6 +38,17 @@
?
--EXPECTF--
*** Testing session_module_name() : variation ***
+string(%d) %s
+string(4) user
+
+Fatal error: Uncaught exception 'Exception' with message 'Stop...!' in %s:%d
+Stack trace:
+#0 [internal function]: open('', 'PHPSESSID')
+#1 %s(%d): session_start()
+#2 {main}
+ thrown in %s on line %d
+--UEXPECTF--
+*** Testing session_module_name() : variation ***
unicode(5) files
unicode(4) user
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_basic.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/session/tests/session_save_path_basic.phpt
diff -u php-src/ext/session/tests/session_save_path_basic.phpt:1.4
php-src/ext/session/tests/session_save_path_basic.phpt:1.5
--- php-src/ext/session/tests/session_save_path_basic.phpt:1.4 Tue May 27
12:17:39 2008
+++ php-src/ext/session/tests/session_save_path_basic.phpt Thu Nov 27
13:49:45 2008
@@ -29,6 +29,12 @@
?
--EXPECTF--
*** Testing session_save_path() : error functionality ***
+string(0)
+string(0)
+string(%d) %s
+Done
+--UEXPECTF--
+*** Testing session_save_path() : error functionality ***
unicode(0)
unicode(0)
unicode(%d) %s
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_variation4.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/session/tests/session_save_path_variation4.phpt
diff -u php-src/ext/session/tests/session_save_path_variation4.phpt:1.6
php-src/ext/session/tests/session_save_path_variation4.phpt:1.7
--- php-src/ext/session/tests/session_save_path_variation4.phpt:1.6 Tue May
27 18:16:04 2008
+++ php-src/ext/session/tests/session_save_path_variation4.phpt Thu Nov 27
13:49:45 2008
@@ -22,10 +22,10 @@
*/
echo *** Testing session_save_path() : variation ***\n;
-$directory = dirname(__FILE__);
-$sessions = ($directory./sessions);
+$initdir = getcwd();
+$sessions = ($initdir./sessions);
-chdir($directory);
+chdir($initdir);
// Delete the existing directory
if (file_exists($sessions) === TRUE) {
@@ -34,7 +34,7 @@
var_dump(mkdir($sessions));
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session/tests session_name_error.phpt session_save_path_error.phpt session_save_path_variation4.phpt
ant Thu Nov 27 13:50:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/session/tests session_save_path_error.phpt
session_save_path_variation4.phpt
session_name_error.phpt
Log:
Latest and greatest versions of these session tests - checked on 5.3 snap on
Windows, Linux and Linux 64 bit.
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_error.phpt?r1=1.1.4.4r2=1.1.4.5diff_format=u
Index: php-src/ext/session/tests/session_save_path_error.phpt
diff -u php-src/ext/session/tests/session_save_path_error.phpt:1.1.4.4
php-src/ext/session/tests/session_save_path_error.phpt:1.1.4.5
--- php-src/ext/session/tests/session_save_path_error.phpt:1.1.4.4 Sat Jun
21 15:27:34 2008
+++ php-src/ext/session/tests/session_save_path_error.phpt Thu Nov 27
13:50:28 2008
@@ -171,8 +171,6 @@
string(0)
-- Iteration 24 --
-
-Warning: session_save_path() expects parameter 1 to be string, resource given
in %s on line %d
-NULL
+string(0)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_variation4.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/session/tests/session_save_path_variation4.phpt
diff -u php-src/ext/session/tests/session_save_path_variation4.phpt:1.1.2.3
php-src/ext/session/tests/session_save_path_variation4.phpt:1.1.2.4
--- php-src/ext/session/tests/session_save_path_variation4.phpt:1.1.2.3 Wed Apr
30 15:20:18 2008
+++ php-src/ext/session/tests/session_save_path_variation4.phpt Thu Nov 27
13:50:28 2008
@@ -22,10 +22,10 @@
*/
echo *** Testing session_save_path() : variation ***\n;
-$directory = dirname(__FILE__);
-$sessions = ($directory./sessions);
+$initdir = getcwd();
+$sessions = ($initdir./sessions);
-chdir($directory);
+chdir($initdir);
// Delete the existing directory
if (file_exists($sessions) === TRUE) {
@@ -34,7 +34,7 @@
var_dump(mkdir($sessions));
var_dump(chdir($sessions));
-ini_set(session.save_path, $directory);
+ini_set(session.save_path, $initdir);
var_dump(session_save_path());
var_dump(session_start());
var_dump(session_save_path());
@@ -46,8 +46,8 @@
ob_end_flush();
?
--CLEAN--
-$directory = dirname(__FILE__);
-$sessions = ($directory./sessions);
+$initdir = getcwd();
+$sessions = ($initdir./sessions);
var_dump(rmdir($sessions));
--EXPECTF--
*** Testing session_save_path() : variation ***
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_name_error.phpt?r1=1.1.4.5r2=1.1.4.6diff_format=u
Index: php-src/ext/session/tests/session_name_error.phpt
diff -u php-src/ext/session/tests/session_name_error.phpt:1.1.4.5
php-src/ext/session/tests/session_name_error.phpt:1.1.4.6
--- php-src/ext/session/tests/session_name_error.phpt:1.1.4.5 Sun Jun 22
19:16:44 2008
+++ php-src/ext/session/tests/session_name_error.phpt Thu Nov 27 13:50:28 2008
@@ -167,8 +167,6 @@
string(0)
-- Iteration 24 --
-
-Warning: session_name() expects parameter 1 to be string, resource given in %s
on line %d
-NULL
+string(0)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/session/tests session_save_path_variation4.phpt
ant Thu Nov 27 13:51:07 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/session/tests session_save_path_variation4.phpt
Log:
Latest and greatest versions of these session tests - checked on 5.2.X snap
on Windows, Linux and Linux 64 bit.
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_variation4.phpt?r1=1.2.2.4r2=1.2.2.5diff_format=u
Index: php-src/ext/session/tests/session_save_path_variation4.phpt
diff -u php-src/ext/session/tests/session_save_path_variation4.phpt:1.2.2.4
php-src/ext/session/tests/session_save_path_variation4.phpt:1.2.2.5
--- php-src/ext/session/tests/session_save_path_variation4.phpt:1.2.2.4 Wed Apr
30 15:20:16 2008
+++ php-src/ext/session/tests/session_save_path_variation4.phpt Thu Nov 27
13:51:07 2008
@@ -22,10 +22,10 @@
*/
echo *** Testing session_save_path() : variation ***\n;
-$directory = dirname(__FILE__);
-$sessions = ($directory./sessions);
+$initdir = getcwd();
+$sessions = ($initdir./sessions);
-chdir($directory);
+chdir($initdir);
// Delete the existing directory
if (file_exists($sessions) === TRUE) {
@@ -34,7 +34,7 @@
var_dump(mkdir($sessions));
var_dump(chdir($sessions));
-ini_set(session.save_path, $directory);
+ini_set(session.save_path, $initdir);
var_dump(session_save_path());
var_dump(session_start());
var_dump(session_save_path());
@@ -46,8 +46,8 @@
ob_end_flush();
?
--CLEAN--
-$directory = dirname(__FILE__);
-$sessions = ($directory./sessions);
+$initdir = getcwd();
+$sessions = ($initdir./sessions);
var_dump(rmdir($sessions));
--EXPECTF--
*** Testing session_save_path() : variation ***
--
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/reg commit.eregi_variation_001.phpt commit.eregi_variation_002.phpt commit.eregi_variation_003.phpt commit.eregi_variation_004.phpt
ant Thu Nov 27 14:30:58 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/reg commit.eregi_variation_001.phpt commit.eregi_variation_004.phpt commit.eregi_variation_003.phpt commit.eregi_variation_002.phpt Log: Latest and greatest versions of these session tests - checked on 5.2.X snap on Windows, Linux and Linux 64 bit. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/reg/commit.eregi_variation_001.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/reg/commit.eregi_variation_001.phpt +++ php-src/ext/standard/tests/reg/commit.eregi_variation_001.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/reg/commit.eregi_variation_004.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/reg/commit.eregi_variation_004.phpt +++ php-src/ext/standard/tests/reg/commit.eregi_variation_004.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/reg/commit.eregi_variation_003.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/reg/commit.eregi_variation_003.phpt +++ php-src/ext/standard/tests/reg/commit.eregi_variation_003.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/reg/commit.eregi_variation_002.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/reg/commit.eregi_variation_002.phpt +++ php-src/ext/standard/tests/reg/commit.eregi_variation_002.phpt -- 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/ereg/tests ereg_replace_variation_002.phpt eregi_replace_variation_002.phpt split_variation_003.phpt spliti_variation_003.phpt
ant Thu Nov 27 14:39:33 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ereg/tests split_variation_003.phpt
ereg_replace_variation_002.phpt
eregi_replace_variation_002.phpt
spliti_variation_003.phpt
Log:
Latest and greatest versions of these session tests - checked on 5.2.X snap
on Windows, Linux and Linux 64 bit.
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/split_variation_003.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/ereg/tests/split_variation_003.phpt
diff -u php-src/ext/ereg/tests/split_variation_003.phpt:1.1.2.5
php-src/ext/ereg/tests/split_variation_003.phpt:1.1.2.6
--- php-src/ext/ereg/tests/split_variation_003.phpt:1.1.2.5 Tue Nov 18
17:55:07 2008
+++ php-src/ext/ereg/tests/split_variation_003.phpt Thu Nov 27 14:39:33 2008
@@ -82,7 +82,6 @@
*** Testing split() : usage variations ***
Arg value 10.5
-Error: 8192 - Function split() is deprecated, %s(73)
array(5) {
[0]=
string(1) 1
@@ -97,130 +96,130 @@
}
Arg value -10.5
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
Arg value 1.07654321E-9
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
Arg value 0.5
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
Arg value Array
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
-NULL
+array(1) {
+ [0]=
+ string(9) 1 2 3 4 5
+}
Arg value Array
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
-NULL
+array(1) {
+ [0]=
+ string(9) 1 2 3 4 5
+}
Arg value Array
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
-NULL
+array(1) {
+ [0]=
+ string(9) 1 2 3 4 5
+}
Arg value Array
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
-NULL
+array(1) {
+ [0]=
+ string(9) 1 2 3 4 5
+}
Arg value Array
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
-NULL
+array(1) {
+ [0]=
+ string(9) 1 2 3 4 5
+}
Arg value
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
Arg value
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
Arg value 1
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
Arg value
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
Arg value 1
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
Arg value
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
Arg value
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
-NULL
+array(1) {
+ [0]=
+ string(9) 1 2 3 4 5
+}
Arg value
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
-NULL
+array(1) {
+ [0]=
+ string(9) 1 2 3 4 5
+}
Arg value string
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
-NULL
+array(1) {
+ [0]=
+ string(9) 1 2 3 4 5
+}
Arg value string
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
-NULL
+array(1) {
+ [0]=
+ string(9) 1 2 3 4 5
+}
Error: 4096 - Object of class stdClass could not be converted to string, %s(72)
Arg value
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, object given, %s(73)
-NULL
+Error: 8 - Object of class stdClass could not be converted to int, %s(73)
+array(1) {
+ [0]=
+ string(9) 1 2 3 4 5
+}
Arg value
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
Arg value
-Error: 8192 - Function split() is deprecated, %s(73)
array(1) {
[0]=
string(9) 1 2 3 4 5
}
-Done
+Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/ereg_replace_variation_002.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/ereg/tests/ereg_replace_variation_002.phpt
diff -u php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.1.2.5
php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.1.2.6
--- php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.1.2.5 Thu Nov
20 13:31:34 2008
+++
[PHP-CVS] cvs: php-src /ext/standard/tests/directory DirectoryClass_basic_001.phpt DirectoryClass_error_001.phpt directory_constants-win32.phpt directory_constants.phpt
ant Thu Nov 27 14:49:14 2008 UTC
Added files:
/php-src/ext/standard/tests/directory directory_constants.phpt
DirectoryClass_error_001.phpt
directory_constants-win32.phpt
DirectoryClass_basic_001.phpt
Log:
Directory tests: checked on PHP 5.2.6, 5.3 and 6.0 (Windows, Linux and Linux
64 bit).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/directory_constants.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/directory/directory_constants.phpt
+++ php-src/ext/standard/tests/directory/directory_constants.phpt
--TEST--
Test that the Directory extension constants are correctly defined.
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip.. Not valid for Windows');
}
?
--FILE--
?php
echo DIRECTORY_SEPARATOR;
echo \n;
echo PATH_SEPARATOR;
echo \n;
echo done;
?
--EXPECT--
/
:
done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/DirectoryClass_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/directory/DirectoryClass_error_001.phpt
+++ php-src/ext/standard/tests/directory/DirectoryClass_error_001.phpt
--TEST--
Directory class behaviour.
--FILE--
?php
echo \n-- Try all methods with bad handle:\n;
$d = new Directory(getcwd());
$d-handle = Havoc!;
var_dump($d-read());
var_dump($d-rewind());
var_dump($d-close());
echo \n-- Try all methods with no handle:\n;
$d = new Directory(getcwd());
unset($d-handle);
var_dump($d-read());
var_dump($d-rewind());
var_dump($d-close());
echo \n-- Try all methods with wrong number of args:\n;
$d = new Directory(getcwd());
var_dump($d-read(1,2));
var_dump($d-rewind(1,2));
var_dump($d-close(1,2));
?
--EXPECTF--
-- Try all methods with bad handle:
Warning: Directory::read(): supplied argument is not a valid Directory resource
in %s on line %d
bool(false)
Warning: Directory::rewind(): supplied argument is not a valid Directory
resource in %s on line %d
bool(false)
Warning: Directory::close(): supplied argument is not a valid Directory
resource in %s on line %d
bool(false)
-- Try all methods with no handle:
Warning: Directory::read(): Unable to find my handle property in %s on line %d
bool(false)
Warning: Directory::rewind(): Unable to find my handle property in %s on line %d
bool(false)
Warning: Directory::close(): Unable to find my handle property in %s on line %d
bool(false)
-- Try all methods with wrong number of args:
Warning: Directory::read() expects at most 1 parameter, 2 given in %s on line %d
NULL
Warning: Directory::rewind() expects at most 1 parameter, 2 given in %s on line
%d
NULL
Warning: Directory::close() expects at most 1 parameter, 2 given in %s on line
%d
NULL
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/directory_constants-win32.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/directory/directory_constants-win32.phpt
+++ php-src/ext/standard/tests/directory/directory_constants-win32.phpt
--TEST--
Test that the Directory extension constants are correctly defined.
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) != 'WIN') {
die('skip.. only for Windows');
}
?
--FILE--
?php
echo DIRECTORY_SEPARATOR;
echo \n;
echo PATH_SEPARATOR;
echo \n;
echo done;
?
--EXPECT--
\
;
done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
+++ php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
--TEST--
Directory class behaviour.
--FILE--
?php
/*
* Prototype: object dir(string directory[, resource context])
* Description: Directory class with properties, handle and class and methods
read, rewind and close
* Class is defined in ext/standard/dir.c
*/
echo Structure of Directory class:\n;
$rc = new ReflectionClass(Directory);
echo $rc;
echo Cannot instantiate a valid Directory directly:\n;
$d = new Directory(getcwd());
var_dump($d);
var_dump($d-read());
?
--EXPECTF--
Structure of Directory class:
Class [ internal%s class Directory ] {
- Constants [0] {
}
- Static properties [0] {
}
- Static methods [0] {
}
- Properties [0] {
}
- Methods [3] {
Method [ internal%s public method close ] {
}
Method [ internal%s public method rewind ] {
}
Method [ internal%s public method read ] {
}
}
}
Cannot instantiate a valid Directory directly:
object(Directory)#%d (0) {
}
Warning: Directory::read(): Unable to find my handle property in %s on line 15
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c /ext/soap/tests/bugs bug44882.phpt bug44882.wsdl
dmitry Thu Nov 27 14:49:46 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug44882.phpt bug44882.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #44882 (SOAP extension object decoding bug)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1333r2=1.2027.2.547.2.1334diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1333 php-src/NEWS:1.2027.2.547.2.1334
--- php-src/NEWS:1.2027.2.547.2.1333Thu Nov 27 11:25:22 2008
+++ php-src/NEWSThu Nov 27 14:49:45 2008
@@ -11,6 +11,7 @@
(Ilia)
- Fixed bug #46427 (SoapClient() stumbles over its stream_context parameter).
(Dmitry, Herman Radtke)
+- Fixed bug #44882 (SOAP extension object decoding bug). (Dmitry)
- Fixed bug #44182 (extract($a, EXTR_REFS) can fail to split copy-on-write
references). (robin_fernandes at uk dot ibm dot com)
- Fixed bug #44181 (extract($a, EXTR_OVERWRITE|EXTR_REFS) can fail to create
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.43r2=1.103.2.21.2.44diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.43
php-src/ext/soap/php_encoding.c:1.103.2.21.2.44
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.43 Sun Oct 26 02:02:05 2008
+++ php-src/ext/soap/php_encoding.c Thu Nov 27 14:49:46 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.43 2008/10/26 02:02:05 felipe Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.44 2008/11/27 14:49:46 dmitry Exp $ */
#include time.h
@@ -1419,7 +1419,7 @@
sdlPtr sdl;
sdlTypePtr sdlType = type-sdl_type;
zend_class_entry *ce = ZEND_STANDARD_CLASS_DEF_PTR;
- zend_bool redo_any = 0;
+ zval *redo_any = NULL;
TSRMLS_FETCH();
if (pce) {
@@ -1491,10 +1491,7 @@
if (soap_check_xml_ref(ret, data TSRMLS_CC)) {
return ret;
}
- if (get_zval_property(ret, any TSRMLS_CC) !=
NULL) {
- unset_zval_property(ret, any
TSRMLS_CC);
- redo_any = 1;
- }
+ redo_any = get_zval_property(ret, any
TSRMLS_CC);
if (Z_TYPE_P(ret) == IS_OBJECT ce !=
ZEND_STANDARD_CLASS_DEF_PTR) {
zend_object *zobj =
zend_objects_get_address(ret TSRMLS_CC);
zobj-ce = ce;
@@ -1520,10 +1517,17 @@
object_init_ex(ret, ce);
}
if (sdlType-model) {
+ if (redo_any) {
+ redo_any-refcount++;
+ unset_zval_property(ret, any TSRMLS_CC);
+ }
model_to_zval_object(ret, sdlType-model, data, sdl
TSRMLS_CC);
- if (redo_any get_zval_property(ret, any TSRMLS_CC)
== NULL) {
- model_to_zval_any(ret, data-children
TSRMLS_CC);
- }
+ if (redo_any) {
+ if (get_zval_property(ret, any TSRMLS_CC) ==
NULL) {
+ model_to_zval_any(ret, data-children
TSRMLS_CC);
+ }
+ zval_ptr_dtor(redo_any);
+ }
}
if (sdlType-attributes) {
sdlAttributePtr *attr;
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug44882.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug44882.phpt
+++ php-src/ext/soap/tests/bugs/bug44882.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug44882.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug44882.wsdl
+++ php-src/ext/soap/tests/bugs/bug44882.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c /ext/soap/tests/bugs bug44882.phpt bug44882.wsdl
dmitry Thu Nov 27 14:50:06 2008 UTC
Modified files:
/php-src/ext/soap php_encoding.c
/php-src/ext/soap/tests/bugsbug44882.phpt bug44882.wsdl
Log:
Fixed bug #44882 (SOAP extension object decoding bug)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.172r2=1.173diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.172
php-src/ext/soap/php_encoding.c:1.173
--- php-src/ext/soap/php_encoding.c:1.172 Sun Oct 26 01:58:25 2008
+++ php-src/ext/soap/php_encoding.c Thu Nov 27 14:50:06 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.172 2008/10/26 01:58:25 felipe Exp $ */
+/* $Id: php_encoding.c,v 1.173 2008/11/27 14:50:06 dmitry Exp $ */
#include time.h
@@ -1388,7 +1388,7 @@
sdlPtr sdl;
sdlTypePtr sdlType = type-sdl_type;
zend_class_entry *ce;
- zend_bool redo_any = 0;
+ zval *redo_any = NULL;
TSRMLS_FETCH();
ce = ZEND_STANDARD_CLASS_DEF_PTR;
@@ -1462,10 +1462,7 @@
if (soap_check_xml_ref(ret, data TSRMLS_CC)) {
return ret;
}
- if (get_zval_property(ret, any TSRMLS_CC) !=
NULL) {
- unset_zval_property(ret, any
TSRMLS_CC);
- redo_any = 1;
- }
+ redo_any = get_zval_property(ret, any
TSRMLS_CC);
if (Z_TYPE_P(ret) == IS_OBJECT ce !=
ZEND_STANDARD_CLASS_DEF_PTR) {
zend_object *zobj =
zend_objects_get_address(ret TSRMLS_CC);
zobj-ce = ce;
@@ -1491,10 +1488,17 @@
object_init_ex(ret, ce);
}
if (sdlType-model) {
+ if (redo_any) {
+ Z_ADDREF_P(redo_any);
+ unset_zval_property(ret, any TSRMLS_CC);
+ }
model_to_zval_object(ret, sdlType-model, data, sdl
TSRMLS_CC);
- if (redo_any get_zval_property(ret, any TSRMLS_CC)
== NULL) {
- model_to_zval_any(ret, data-children
TSRMLS_CC);
- }
+ if (redo_any) {
+ if (get_zval_property(ret, any TSRMLS_CC) ==
NULL) {
+ model_to_zval_any(ret, data-children
TSRMLS_CC);
+ }
+ zval_ptr_dtor(redo_any);
+ }
}
if (sdlType-attributes) {
sdlAttributePtr *attr;
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug44882.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug44882.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug44882.phpt:1.2
--- /dev/null Thu Nov 27 14:50:06 2008
+++ php-src/ext/soap/tests/bugs/bug44882.phpt Thu Nov 27 14:50:06 2008
@@ -0,0 +1,64 @@
+--TEST--
+Bug #44882 (SOAP extension object decoding bug)
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+?php
+class TestSoapClient extends SoapClient
+{
+ public function __doRequest($req, $loc, $act, $ver, $oneway=0)
+ {
+ return XML
+?xml version=1.0 encoding=UTF-8?
+SOAP-ENV:Envelope
+ xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xmlns:ns=urn:ebay:api:PayPalAPI
+ SOAP-ENV:Body id=_0
+GetExpressCheckoutDetailsResponse xmlns=urn:ebay:api:PayPalAPI
+ Timestamp2008-06-23T14:51:08Z/Timestamp
+ AckSuccess/Ack
+ CorrelationIDae013a0ccdf13/CorrelationID
+ Version50.00/Version
+ Build588340/Build
+ GetExpressCheckoutDetailsResponseDetails
xsi:type=ns:GetExpressCheckoutDetailsResponseDetailsType
+TokenEC-11Y75137T2399952C/Token
+PayerInfo
+ Payer[EMAIL PROTECTED]/Payer
+ PayerIDMU82WA43YXM9C/PayerID
+ PayerStatusverified/PayerStatus
+/PayerInfo
+ /GetExpressCheckoutDetailsResponseDetails
+/GetExpressCheckoutDetailsResponse
+ /SOAP-ENV:Body
+/SOAP-ENV:Envelope
+XML;
+ }
+}
+
+$client = new TestSoapClient(dirname(__FILE__).'/bug44882.wsdl');
+print_r($client-GetExpressCheckoutDetails());
+?
+--EXPECT--
+stdClass Object
+(
+[Timestamp] = 2008-06-23T14:51:08Z
+[Ack] = Success
+[CorrelationID] = ae013a0ccdf13
+[Version] = 50.00
+[Build] = 588340
+[GetExpressCheckoutDetailsResponseDetails] = stdClass Object
+(
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/directory DirectoryClass_basic_001.phpt DirectoryClass_error_001.phpt directory_constants-win32.phpt directory_constants.phpt
ant Thu Nov 27 14:50:28 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/directory
directory_constants-win32.phpt
DirectoryClass_basic_001.phpt
DirectoryClass_error_001.phpt
directory_constants.phpt
Log:
Directory tests: checked on PHP 5.2.6, 5.3 and 6.0 (Windows, Linux and Linux
64 bit).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/directory_constants-win32.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/directory/directory_constants-win32.phpt
+++ php-src/ext/standard/tests/directory/directory_constants-win32.phpt
--TEST--
Test that the Directory extension constants are correctly defined.
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) != 'WIN') {
die('skip.. only for Windows');
}
?
--FILE--
?php
echo DIRECTORY_SEPARATOR;
echo \n;
echo PATH_SEPARATOR;
echo \n;
echo done;
?
--EXPECT--
\
;
done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
+++ php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
--TEST--
Directory class behaviour.
--FILE--
?php
/*
* Prototype: object dir(string directory[, resource context])
* Description: Directory class with properties, handle and class and methods
read, rewind and close
* Class is defined in ext/standard/dir.c
*/
echo Structure of Directory class:\n;
$rc = new ReflectionClass(Directory);
echo $rc;
echo Cannot instantiate a valid Directory directly:\n;
$d = new Directory(getcwd());
var_dump($d);
var_dump($d-read());
?
--EXPECTF--
Structure of Directory class:
Class [ internal%s class Directory ] {
- Constants [0] {
}
- Static properties [0] {
}
- Static methods [0] {
}
- Properties [0] {
}
- Methods [3] {
Method [ internal%s public method close ] {
}
Method [ internal%s public method rewind ] {
}
Method [ internal%s public method read ] {
}
}
}
Cannot instantiate a valid Directory directly:
object(Directory)#%d (0) {
}
Warning: Directory::read(): Unable to find my handle property in %s on line 15
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/DirectoryClass_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/directory/DirectoryClass_error_001.phpt
+++ php-src/ext/standard/tests/directory/DirectoryClass_error_001.phpt
--TEST--
Directory class behaviour.
--FILE--
?php
echo \n-- Try all methods with bad handle:\n;
$d = new Directory(getcwd());
$d-handle = Havoc!;
var_dump($d-read());
var_dump($d-rewind());
var_dump($d-close());
echo \n-- Try all methods with no handle:\n;
$d = new Directory(getcwd());
unset($d-handle);
var_dump($d-read());
var_dump($d-rewind());
var_dump($d-close());
echo \n-- Try all methods with wrong number of args:\n;
$d = new Directory(getcwd());
var_dump($d-read(1,2));
var_dump($d-rewind(1,2));
var_dump($d-close(1,2));
?
--EXPECTF--
-- Try all methods with bad handle:
Warning: Directory::read(): supplied argument is not a valid Directory resource
in %s on line %d
bool(false)
Warning: Directory::rewind(): supplied argument is not a valid Directory
resource in %s on line %d
bool(false)
Warning: Directory::close(): supplied argument is not a valid Directory
resource in %s on line %d
bool(false)
-- Try all methods with no handle:
Warning: Directory::read(): Unable to find my handle property in %s on line %d
bool(false)
Warning: Directory::rewind(): Unable to find my handle property in %s on line %d
bool(false)
Warning: Directory::close(): Unable to find my handle property in %s on line %d
bool(false)
-- Try all methods with wrong number of args:
Warning: Directory::read() expects at most 1 parameter, 2 given in %s on line %d
NULL
Warning: Directory::rewind() expects at most 1 parameter, 2 given in %s on line
%d
NULL
Warning: Directory::close() expects at most 1 parameter, 2 given in %s on line
%d
NULL
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/directory_constants.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/directory/directory_constants.phpt
+++ php-src/ext/standard/tests/directory/directory_constants.phpt
--TEST--
Test that the Directory extension constants are correctly defined.
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip.. Not valid for Windows');
}
?
--FILE--
?php
echo DIRECTORY_SEPARATOR;
echo \n;
echo PATH_SEPARATOR;
echo \n;
echo done;
?
--EXPECT--
/
:
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/curl interface.c
iliaa Thu Nov 27 17:00:04 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
Fixed bug #46696 (cURL fails in upload files with specified content-type)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.19r2=1.62.2.14.2.27.2.20diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.19
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.20
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.19Mon Nov 17 11:27:53 2008
+++ php-src/ext/curl/interface.cThu Nov 27 17:00:04 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.19 2008/11/17 11:27:53 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.20 2008/11/27 17:00:04 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1582,17 +1582,37 @@
* must be explicitly cast to long in
curl_formadd
* use since curl needs a long not an
int. */
if (*postval == '@') {
+ char *type;
++postval;
+
+ if ((type =
php_memnstr(postval, ;type=, sizeof(;type=) - 1, postval +
strlen(postval {
+ *type = '\0';
+ }
/* safe_mode / open_basedir
check */
if
(php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode)
!php_checkuid(postval, rb+, CHECKUID_CHECK_MODE_PARAM))) {
+ if (type) {
+ *type = ';';
+ }
RETVAL_FALSE;
return 1;
}
- error = curl_formadd(first,
last,
+ if (type) {
+ type++;
+ error =
curl_formadd(first, last,
+
CURLFORM_COPYNAME, string_key,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
+
CURLFORM_FILE, postval,
+
CURLFORM_CONTENTTYPE, type,
+
CURLFORM_END);
+ *(type - 1) = ';';
+ } else {
+ error =
curl_formadd(first, last,
CURLFORM_COPYNAME, string_key,
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
-
CURLFORM_FILE, postval,
+
CURLFORM_FILE, postval,
CURLFORM_END);
+
+ }
} else {
error = curl_formadd(first,
last,
CURLFORM_COPYNAME, string_key,
--
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/curl interface.c
iliaa Thu Nov 27 17:01:29 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
/php-srcNEWS
Log:
MFB: Fixed bug #46696 (cURL fails in upload files with specified
content-type)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.36r2=1.62.2.14.2.37diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.36
php-src/ext/curl/interface.c:1.62.2.14.2.37
--- php-src/ext/curl/interface.c:1.62.2.14.2.36 Tue Jul 29 10:42:59 2008
+++ php-src/ext/curl/interface.cThu Nov 27 17:01:29 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.36 2008/07/29 10:42:59 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.37 2008/11/27 17:01:29 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1481,17 +1481,37 @@
* must be explicitly cast to long in
curl_formadd
* use since curl needs a long not an
int. */
if (*postval == '@') {
+ char *type;
++postval;
+
+ if ((type =
php_memnstr(postval, ;type=, sizeof(;type=) - 1, postval +
strlen(postval {
+ *type = '\0';
+ }
/* safe_mode / open_basedir
check */
if
(php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode)
!php_checkuid(postval, rb+, CHECKUID_CHECK_MODE_PARAM))) {
+ if (type) {
+ *type = ';';
+ }
RETVAL_FALSE;
return 1;
}
- error = curl_formadd(first,
last,
+ if (type) {
+ type++;
+ error =
curl_formadd(first, last,
+
CURLFORM_COPYNAME, string_key,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
+
CURLFORM_FILE, postval,
+
CURLFORM_CONTENTTYPE, type,
+
CURLFORM_END);
+ *(type - 1) = ';';
+ } else {
+ error =
curl_formadd(first, last,
CURLFORM_COPYNAME, string_key,
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
-
CURLFORM_FILE, postval,
+
CURLFORM_FILE, postval,
CURLFORM_END);
+
+ }
} else {
error = curl_formadd(first,
last,
CURLFORM_COPYNAME, string_key,
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1334r2=1.2027.2.547.2.1335diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1334 php-src/NEWS:1.2027.2.547.2.1335
--- php-src/NEWS:1.2027.2.547.2.1334Thu Nov 27 14:49:45 2008
+++ php-src/NEWSThu Nov 27 17:01:29 2008
@@ -4,6 +4,8 @@
- Upgraded PCRE to version 7.8 (Ilia)
- Fixed memory leak inside readline_callback_handler_remove() function.
(Felipe)
+- Fixed bug #46696 (cURL fails in upload files with specified content-type).
+ (Ilia)
- Fixed bug #46673 (stream_lock call with wrong paramater). (Arnaud)
- Fixed bug #46649 (Setting array element with that same array produces
inconsistent results). (Arnaud)
--
PHP CVS Mailing List
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
iliaa Thu Nov 27 17:29:21 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Updated NEWS file with CVE #s http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1335r2=1.2027.2.547.2.1336diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1335 php-src/NEWS:1.2027.2.547.2.1336 --- php-src/NEWS:1.2027.2.547.2.1335Thu Nov 27 17:01:29 2008 +++ php-src/NEWSThu Nov 27 17:29:20 2008 @@ -1,7 +1,11 @@ PHPNEWS ||| ?? Nov 2008, PHP 5.2.7 -- Upgraded PCRE to version 7.8 (Ilia) +- Upgraded PCRE to version 7.8 (Fixes CVE-2008-2371) (Ilia) + +- Fixed a crash inside gd with invalid fonts (Fixes CVE-2008-3658). (Pierre) +- Fixed a possible overflow inside memnstr (Fixes CVE-2008-3659). (Laurent + Gaffie) - Fixed memory leak inside readline_callback_handler_remove() function. (Felipe) - Fixed bug #46696 (cURL fails in upload files with specified content-type). @@ -142,7 +146,7 @@ pgsql). (Felipe) - Fixed bug #43723 (SOAP not sent properly from client for choice). (Dmitry) - Fixed bug #42862 (IMAP toolkit crash: rfc822.c legacy routine buffer - overflow). (Dmitry) + overflow). (Fixes CVE-2008-2829) (Dmitry) - Fixed bug #42078 (pg_meta_data mix tables metadata from different schemas). (Felipe) - Fixed bug #37100 (data is returned truncated with BINARY CURSOR). (Tony) @@ -249,7 +253,7 @@ - Fixed bug #45178 (memory corruption on assignment result of new by reference). (Dmitry) - Fixed bug #45151 (Crash with URI/file..php (filename contains 2 dots)). - (Dmitry) + (Fixes CVE-2008-3660) (Dmitry) - Fixed bug #45139 (ReflectionProperty returns incorrect declaring class). (Felipe) - Fixed bug #45124 ($_FILES['upload']['size'] sometimes return zero and -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/curl interface.c /ext/dom xpath.c /ext/mysql php_mysql.c /ext/mysqli mysqli.c /ext/pdo pdo_dbh.c pdo_stmt.c /ext/pdo_sqlite sqlite_driver.c /ext/pgsq
dmitry Thu Nov 27 19:01:27 2008 UTC
Added files: (Branch: PHP_5_3)
/ZendEngine2/tests bug46409.phpt
Modified files:
/php-srcNEWS
/ZendEngine2zend_API.c zend_API.h zend_closures.c
zend_exceptions.c zend_execute_API.c zend_interfaces.c
zend_object_handlers.c zend_object_handlers.h
zend_vm_def.h zend_vm_execute.h
/php-src/ext/curl interface.c
/php-src/ext/domxpath.c
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
/php-src/ext/pdo_sqlite sqlite_driver.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/soap soap.c
/php-src/ext/splphp_spl.c spl_directory.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/sqlite3sqlite3.c
/php-src/ext/xmlxml.c
/php-src/ext/xslxsltprocessor.c
/php-src/main/streams userspace.c
Log:
Fixed bug #46409 (__invoke method called outside of object context when using
array_map)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.391r2=1.2027.2.547.2.965.2.392diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.391
php-src/NEWS:1.2027.2.547.2.965.2.392
--- php-src/NEWS:1.2027.2.547.2.965.2.391 Thu Nov 27 08:44:56 2008
+++ php-src/NEWSThu Nov 27 19:01:18 2008
@@ -41,6 +41,8 @@
- Fixed bug #46546 (Segmentation fault when using declare statement with
non-string value). (Felipe)
- Fixed bug #46421 (SplFileInfo not correctly handling /). (Etienne)
+- Fixed bug #46409 (__invoke method called outside of object context when using
+ array_map). (Dmitry)
- Fixed bug #46331 - (Segfault when using internal fileinfo magic file on big
endian systems). (Scott)
- Fixed bug #46285 (lastInsertId() returns 0 when a deferenced PDOStatement
is
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34.2.57r2=1.296.2.27.2.34.2.58diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34.2.57
ZendEngine2/zend_API.c:1.296.2.27.2.34.2.58
--- ZendEngine2/zend_API.c:1.296.2.27.2.34.2.57 Tue Nov 25 22:15:22 2008
+++ ZendEngine2/zend_API.c Thu Nov 27 19:01:19 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.c,v 1.296.2.27.2.34.2.57 2008/11/25 22:15:22 stas Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.34.2.58 2008/11/27 19:01:19 dmitry Exp $ */
#include zend.h
#include zend_execute.h
@@ -2329,8 +2329,8 @@
} else {
fcc-called_scope = EG(called_scope);
fcc-calling_scope = EG(scope);
- if (!fcc-object_pp) {
- fcc-object_pp = EG(This) ? EG(This) : NULL;
+ if (!fcc-object_ptr) {
+ fcc-object_ptr = EG(This);
}
ret = 1;
}
@@ -2343,8 +2343,8 @@
} else {
fcc-called_scope = EG(called_scope);
fcc-calling_scope = EG(scope)-parent;
- if (!fcc-object_pp) {
- fcc-object_pp = EG(This) ? EG(This) : NULL;
+ if (!fcc-object_ptr) {
+ fcc-object_ptr = EG(This);
}
ret = 1;
}
@@ -2355,8 +2355,8 @@
} else {
fcc-called_scope = EG(called_scope);
fcc-calling_scope = EG(called_scope);
- if (!fcc-object_pp) {
- fcc-object_pp = EG(This) ? EG(This) : NULL;
+ if (!fcc-object_ptr) {
+ fcc-object_ptr = EG(This);
}
ret = 1;
}
@@ -2364,13 +2364,13 @@
zend_class_entry *scope = EG(active_op_array) ?
EG(active_op_array)-scope : NULL;
fcc-calling_scope = *pce;
- if (scope !fcc-object_pp EG(This)
+ if (scope !fcc-object_ptr EG(This)
instanceof_function(Z_OBJCE_P(EG(This)), scope TSRMLS_CC)
instanceof_function(scope, fcc-calling_scope TSRMLS_CC)) {
- fcc-object_pp = EG(This);
- fcc-called_scope = Z_OBJCE_PP(fcc-object_pp);
+ fcc-object_ptr = EG(This);
+ fcc-called_scope = Z_OBJCE_P(fcc-object_ptr);
} else {
- fcc-called_scope = fcc-object_pp ?
Z_OBJCE_PP(fcc-object_pp) : fcc-calling_scope;
+ fcc-called_scope = fcc-object_ptr ?
Z_OBJCE_P(fcc-object_ptr) : fcc-calling_scope;
[PHP-CVS] cvs: php-src /ext/curl interface.c /ext/dom xpath.c /ext/mysql php_mysql.c /ext/mysqli mysqli.c /ext/pdo pdo_dbh.c pdo_stmt.c /ext/pdo_sqlite sqlite_driver.c /ext/pgsql pgsql.c /ext/r
dmitry Thu Nov 27 19:02:46 2008 UTC
Modified files:
/ZendEngine2zend_API.c zend_API.h zend_closures.c zend_closures.h
zend_exceptions.c zend_execute_API.c zend_interfaces.c
zend_object_handlers.c zend_object_handlers.h
zend_vm_def.h zend_vm_execute.h
/ZendEngine2/tests bug46409.phpt
/php-src/ext/curl interface.c
/php-src/ext/domxpath.c
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
/php-src/ext/pdo_sqlite sqlite_driver.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/soap soap.c
/php-src/ext/splphp_spl.c spl_directory.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/sqlite3sqlite3.c
/php-src/ext/xmlxml.c
/php-src/ext/xslxsltprocessor.c
/php-src/main/streams userspace.c
Log:
Fixed bug #46409 (__invoke method called outside of object context when using
array_map)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.492r2=1.493diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.492 ZendEngine2/zend_API.c:1.493
--- ZendEngine2/zend_API.c:1.492Tue Nov 25 22:23:28 2008
+++ ZendEngine2/zend_API.c Thu Nov 27 19:02:43 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.c,v 1.492 2008/11/25 22:23:28 stas Exp $ */
+/* $Id: zend_API.c,v 1.493 2008/11/27 19:02:43 dmitry Exp $ */
#include zend.h
#include zend_execute.h
@@ -2713,8 +2713,8 @@
} else {
fcc-called_scope = EG(called_scope);
fcc-calling_scope = EG(scope);
- if (!fcc-object_pp) {
- fcc-object_pp = EG(This) ? EG(This) : NULL;
+ if (!fcc-object_ptr) {
+ fcc-object_ptr = EG(This);
}
ret = 1;
}
@@ -2727,8 +2727,8 @@
} else {
fcc-called_scope = EG(called_scope);
fcc-calling_scope = EG(scope)-parent;
- if (!fcc-object_pp) {
- fcc-object_pp = EG(This) ? EG(This) : NULL;
+ if (!fcc-object_ptr) {
+ fcc-object_ptr = EG(This);
}
ret = 1;
}
@@ -2739,8 +2739,8 @@
} else {
fcc-called_scope = EG(called_scope);
fcc-calling_scope = EG(called_scope);
- if (!fcc-object_pp) {
- fcc-object_pp = EG(This) ? EG(This) : NULL;
+ if (!fcc-object_ptr) {
+ fcc-object_ptr = EG(This);
}
ret = 1;
}
@@ -2748,13 +2748,13 @@
zend_class_entry *scope = EG(active_op_array) ?
EG(active_op_array)-scope : NULL;
fcc-calling_scope = *pce;
- if (scope !fcc-object_pp EG(This)
+ if (scope !fcc-object_ptr EG(This)
instanceof_function(Z_OBJCE_P(EG(This)), scope TSRMLS_CC)
instanceof_function(scope, fcc-calling_scope TSRMLS_CC)) {
- fcc-object_pp = EG(This);
- fcc-called_scope = Z_OBJCE_PP(fcc-object_pp);
+ fcc-object_ptr = EG(This);
+ fcc-called_scope = Z_OBJCE_P(fcc-object_ptr);
} else {
- fcc-called_scope = fcc-object_pp ?
Z_OBJCE_PP(fcc-object_pp) : fcc-calling_scope;
+ fcc-called_scope = fcc-object_ptr ?
Z_OBJCE_P(fcc-object_ptr) : fcc-calling_scope;
}
ret = 1;
} else {
@@ -2896,8 +2896,8 @@
fcc-function_handler = priv_fbc;
}
}
- } else if (fcc-object_pp) {
- if (Z_OBJ_HT_PP(fcc-object_pp)-get_method) {
+ } else if (fcc-object_ptr) {
+ if (Z_OBJ_HT_P(fcc-object_ptr)-get_method) {
zstr method = mname;
int method_len = mlen;
@@ -2906,7 +2906,7 @@
} else if (!UG(unicode) Z_TYPE_P(callable) ==
IS_UNICODE) {
zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), method.s,
method_len, mname.u, mlen TSRMLS_CC);
}
- fcc-function_handler =
Z_OBJ_HT_PP(fcc-object_pp)-get_method(fcc-object_pp, method, method_len
TSRMLS_CC);
+ fcc-function_handler =
[PHP-CVS] cvs: php-src / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
scottmacThu Nov 27 19:45:16 2008 UTC
Modified files:
/php-srcconfigure.in
/php-src/ext/fileinfo/libmagic print.c
/php-src/main snprintf.c snprintf.h
Log:
Add asprintf, use regular system malloc and free and add checks in
configure.in for the functions
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.666r2=1.667diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.666 php-src/configure.in:1.667
--- php-src/configure.in:1.666 Mon Nov 17 15:12:33 2008
+++ php-src/configure.inThu Nov 27 19:45:16 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.666 2008/11/17 15:12:33 dsp Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.667 2008/11/27 19:45:16 scottmac Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -637,6 +637,8 @@
nanosleep \
utime \
vsnprintf \
+vasprintf \
+asprintf \
)
dnl Check for getaddrinfo, should be a better way, but...
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/print.c?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/fileinfo/libmagic/print.c
diff -u php-src/ext/fileinfo/libmagic/print.c:1.5
php-src/ext/fileinfo/libmagic/print.c:1.6
--- php-src/ext/fileinfo/libmagic/print.c:1.5 Sat Nov 22 10:27:19 2008
+++ php-src/ext/fileinfo/libmagic/print.c Thu Nov 27 19:45:16 2008
@@ -62,7 +62,7 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Warning: %s,
expanded_format);
- efree(expanded_format);
+ free(expanded_format);
}
protected const char *
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.65r2=1.66diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.65 php-src/main/snprintf.c:1.66
--- php-src/main/snprintf.c:1.65Fri Nov 21 21:49:52 2008
+++ php-src/main/snprintf.c Thu Nov 27 19:45:16 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.65 2008/11/21 21:49:52 scottmac Exp $ */
+/* $Id: snprintf.c,v 1.66 2008/11/27 19:45:16 scottmac Exp $ */
#include php.h
@@ -1327,9 +1327,9 @@
*buf = NULL;
if (cc = 0) {
- if ((*buf = emalloc(++cc)) != NULL) {
+ if ((*buf = malloc(++cc)) != NULL) {
if ((cc = ap_php_vsnprintf(*buf, cc, format, ap)) 0) {
- efree(*buf);
+ free(*buf);
*buf = NULL;
}
}
@@ -1339,6 +1339,18 @@
}
/* }}} */
+PHPAPI int ap_php_asprintf(char **buf, const char *format, ...) /* {{{ */
+{
+ int cc;
+ va_list ap;
+
+ va_start(ap, format);
+ cc = vasprintf(buf, format, ap);
+ va_end(ap);
+ return cc;
+}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.h?r1=1.43r2=1.44diff_format=u
Index: php-src/main/snprintf.h
diff -u php-src/main/snprintf.h:1.43 php-src/main/snprintf.h:1.44
--- php-src/main/snprintf.h:1.43Fri Nov 21 21:49:52 2008
+++ php-src/main/snprintf.h Thu Nov 27 19:45:16 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: snprintf.h,v 1.43 2008/11/21 21:49:52 scottmac Exp $ */
+/* $Id: snprintf.h,v 1.44 2008/11/27 19:45:16 scottmac Exp $ */
/*
@@ -83,6 +83,7 @@
PHPAPI int ap_php_snprintf(char *, size_t, const char *, ...);
PHPAPI int ap_php_vsnprintf(char *, size_t, const char *, va_list ap);
PHPAPI int ap_php_vasprintf(char **buf, const char *format, va_list ap);
+PHPAPI int ap_php_asprintf(char **buf, const char *format, ...);
PHPAPI int php_sprintf (char* s, const char* format, ...)
PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
PHPAPI char * php_gcvt(double value, int ndigit, char dec_point, char
exponent, char *buf);
PHPAPI char * php_conv_fp(register char format, register double num,
@@ -110,10 +111,13 @@
#endif
#define vsnprintf ap_php_vsnprintf
-#ifdef vasprintf
-#undef vasprintf
-#endif
+#ifndef HAVE_VASPRINTF
#define vasprintf ap_php_vasprintf
+#endif
+
+#ifndef HAVE_ASPRINTF
+#define asprintf ap_php_asprintf
+#endif
#ifdef sprintf
#undef sprintf
--
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) / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
scottmacThu Nov 27 19:45:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcconfigure.in
/php-src/ext/fileinfo/libmagic print.c
/php-src/main snprintf.c snprintf.h
Log:
MFH Add asprintf, use regular system malloc and free and add checks in
configure.in for the functions
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.33r2=1.579.2.52.2.77.2.34diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.77.2.33
php-src/configure.in:1.579.2.52.2.77.2.34
--- php-src/configure.in:1.579.2.52.2.77.2.33 Mon Nov 17 15:17:49 2008
+++ php-src/configure.inThu Nov 27 19:45:27 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.77.2.33 2008/11/17 15:17:49 dsp Exp $ -*-
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.77.2.34 2008/11/27 19:45:27 scottmac Exp $
-*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -637,6 +637,8 @@
nanosleep \
utime \
vsnprintf \
+vasprintf \
+asprintf \
)
dnl Check for getaddrinfo, should be a better way, but...
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/print.c?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/fileinfo/libmagic/print.c
diff -u php-src/ext/fileinfo/libmagic/print.c:1.1.2.4
php-src/ext/fileinfo/libmagic/print.c:1.1.2.5
--- php-src/ext/fileinfo/libmagic/print.c:1.1.2.4 Sat Nov 22 10:29:05 2008
+++ php-src/ext/fileinfo/libmagic/print.c Thu Nov 27 19:45:27 2008
@@ -62,7 +62,7 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Warning: %s,
expanded_format);
- efree(expanded_format);
+ free(expanded_format);
}
protected const char *
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.37.2.4.2.14.2.6r2=1.37.2.4.2.14.2.7diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.37.2.4.2.14.2.6
php-src/main/snprintf.c:1.37.2.4.2.14.2.7
--- php-src/main/snprintf.c:1.37.2.4.2.14.2.6 Fri Nov 21 22:05:03 2008
+++ php-src/main/snprintf.c Thu Nov 27 19:45:27 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.37.2.4.2.14.2.6 2008/11/21 22:05:03 scottmac Exp $ */
+/* $Id: snprintf.c,v 1.37.2.4.2.14.2.7 2008/11/27 19:45:27 scottmac Exp $ */
#include php.h
@@ -1280,9 +1280,9 @@
*buf = NULL;
if (cc = 0) {
- if ((*buf = emalloc(++cc)) != NULL) {
+ if ((*buf = malloc(++cc)) != NULL) {
if ((cc = ap_php_vsnprintf(*buf, cc, format, ap)) 0) {
- efree(*buf);
+ free(*buf);
*buf = NULL;
}
}
@@ -1292,6 +1292,18 @@
}
/* }}} */
+PHPAPI int ap_php_asprintf(char **buf, const char *format, ...) /* {{{ */
+{
+ int cc;
+ va_list ap;
+
+ va_start(ap, format);
+ cc = vasprintf(buf, format, ap);
+ va_end(ap);
+ return cc;
+}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.h?r1=1.32.2.3.2.5.2.3r2=1.32.2.3.2.5.2.4diff_format=u
Index: php-src/main/snprintf.h
diff -u php-src/main/snprintf.h:1.32.2.3.2.5.2.3
php-src/main/snprintf.h:1.32.2.3.2.5.2.4
--- php-src/main/snprintf.h:1.32.2.3.2.5.2.3Fri Nov 21 22:05:03 2008
+++ php-src/main/snprintf.h Thu Nov 27 19:45:27 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: snprintf.h,v 1.32.2.3.2.5.2.3 2008/11/21 22:05:03 scottmac Exp $ */
+/* $Id: snprintf.h,v 1.32.2.3.2.5.2.4 2008/11/27 19:45:27 scottmac Exp $ */
/*
@@ -83,6 +83,7 @@
PHPAPI int ap_php_snprintf(char *, size_t, const char *, ...);
PHPAPI int ap_php_vsnprintf(char *, size_t, const char *, va_list ap);
PHPAPI int ap_php_vasprintf(char **buf, const char *format, va_list ap);
+PHPAPI int ap_php_asprintf(char **buf, const char *format, ...);
PHPAPI int php_sprintf (char* s, const char* format, ...)
PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
PHPAPI char * php_gcvt(double value, int ndigit, char dec_point, char
exponent, char *buf);
PHPAPI char * php_conv_fp(register char format, register double num,
@@ -110,10 +111,13 @@
#endif
#define vsnprintf ap_php_vsnprintf
-#ifdef vasprintf
-#undef vasprintf
-#endif
+#ifndef HAVE_VASPRINTF
#define vasprintf ap_php_vasprintf
+#endif
+
+#ifndef HAVE_ASPRINTF
+#define asprintf ap_php_asprintf
+#endif
#ifdef sprintf
#undef sprintf
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
Is there a reason you do not want to use PHP wrappers allocation protection? On 27-Nov-08, at 2:45 PM, Scott MacVicar wrote: scottmacThu Nov 27 19:45:16 2008 UTC Modified files: /php-src configure.in /php-src/ext/fileinfo/libmagic print.c /php-src/mainsnprintf.c snprintf.h Log: Add asprintf, use regular system malloc and free and add checks in configure.in for the functions Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
On 27 Nov 2008, at 20:33, Ilia Alshanetsky wrote: Is there a reason you do not want to use PHP wrappers allocation protection? On 27-Nov-08, at 2:45 PM, Scott MacVicar wrote: scottmacThu Nov 27 19:45:16 2008 UTC Modified files: /php-src configure.in /php-src/ext/fileinfo/libmagicprint.c /php-src/main snprintf.c snprintf.h Log: Add asprintf, use regular system malloc and free and add checks in configure.in for the functions Ilia Alshanetsky If you didn't realise you were using a PHP version and used a free() as you'd expect to work then you'd get the memory manager complaining later on. Scott -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
Do we have other extensions using libmagic other then fileinfo? Otherwise, could we not solve it with define flags for fileinfo extension? On 27-Nov-08, at 3:40 PM, Scott MacVicar wrote: On 27 Nov 2008, at 20:33, Ilia Alshanetsky wrote: Is there a reason you do not want to use PHP wrappers allocation protection? On 27-Nov-08, at 2:45 PM, Scott MacVicar wrote: scottmacThu Nov 27 19:45:16 2008 UTC Modified files: /php-src configure.in /php-src/ext/fileinfo/libmagic print.c /php-src/main snprintf.c snprintf.h Log: Add asprintf, use regular system malloc and free and add checks in configure.in for the functions Ilia Alshanetsky If you didn't realise you were using a PHP version and used a free() as you'd expect to work then you'd get the memory manager complaining later on. Scott Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/hash hash.c /ext/mhash CREDITS config.m4 config.w32 mhash.c php_mhash.h
scottmacThu Nov 27 21:11:51 2008 UTC
Removed files:
/php-src/ext/mhash CREDITS config.m4 config.w32 mhash.c php_mhash.h
Modified files:
/php-src/ext/hash hash.c
Log:
Move mhash extension registration code into the hash module startup. This
allows extension_loaded('mhash'); to work.
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash.c?r1=1.51r2=1.52diff_format=u
Index: php-src/ext/hash/hash.c
diff -u php-src/ext/hash/hash.c:1.51 php-src/ext/hash/hash.c:1.52
--- php-src/ext/hash/hash.c:1.51Mon Nov 17 11:26:20 2008
+++ php-src/ext/hash/hash.c Thu Nov 27 21:11:51 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: hash.c,v 1.51 2008/11/17 11:26:20 felipe Exp $ */
+/* $Id: hash.c,v 1.52 2008/11/27 21:11:51 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -776,6 +776,27 @@
#ifdef PHP_MHASH_BC
+PHP_MINFO_FUNCTION(mhash)
+{
+ php_info_print_table_start();
+ php_info_print_table_row(2, MHASH support, Enabled);
+ php_info_print_table_row(2, MHASH API Version, Emulated Support);
+ php_info_print_table_end();
+}
+
+zend_module_entry mhash_module_entry = {
+ STANDARD_MODULE_HEADER,
+ mhash,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ PHP_MINFO(mhash),
+ NO_VERSION_YET,
+ STANDARD_MODULE_PROPERTIES,
+};
+
static void mhash_init(INIT_FUNC_ARGS)
{
char buf[128];
@@ -791,6 +812,8 @@
len = slprintf(buf, 127, MHASH_%s, algorithm.mhash_name,
strlen(algorithm.mhash_name));
zend_register_long_constant(buf, len + 1, algorithm.value,
CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
}
+
+ zend_register_module_ex(mhash_module_entry TSRMLS_CC);
}
/* {{{ proto binary mhash(int hash, binary data [, binary key]) U
--
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/hash hash.c /ext/mhash CREDITS config.m4 config.w32 mhash.c php_mhash.h
scottmacThu Nov 27 21:11:55 2008 UTC
Removed files: (Branch: PHP_5_3)
/php-src/ext/mhash CREDITS config.m4 config.w32 mhash.c php_mhash.h
Modified files:
/php-src/ext/hash hash.c
Log:
MFH Move mhash extension registration code into the hash module startup. This
allows extension_loaded('mhash'); to work.
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash.c?r1=1.18.2.5.2.7.2.14r2=1.18.2.5.2.7.2.15diff_format=u
Index: php-src/ext/hash/hash.c
diff -u php-src/ext/hash/hash.c:1.18.2.5.2.7.2.14
php-src/ext/hash/hash.c:1.18.2.5.2.7.2.15
--- php-src/ext/hash/hash.c:1.18.2.5.2.7.2.14 Mon Nov 17 11:27:55 2008
+++ php-src/ext/hash/hash.c Thu Nov 27 21:11:55 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: hash.c,v 1.18.2.5.2.7.2.14 2008/11/17 11:27:55 felipe Exp $ */
+/* $Id: hash.c,v 1.18.2.5.2.7.2.15 2008/11/27 21:11:55 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -607,6 +607,27 @@
#ifdef PHP_MHASH_BC
+PHP_MINFO_FUNCTION(mhash)
+{
+ php_info_print_table_start();
+ php_info_print_table_row(2, MHASH support, Enabled);
+ php_info_print_table_row(2, MHASH API Version, Emulated Support);
+ php_info_print_table_end();
+}
+
+zend_module_entry mhash_module_entry = {
+ STANDARD_MODULE_HEADER,
+ mhash,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ PHP_MINFO(mhash),
+ NO_VERSION_YET,
+ STANDARD_MODULE_PROPERTIES,
+};
+
static void mhash_init(INIT_FUNC_ARGS)
{
char buf[128];
@@ -622,6 +643,8 @@
len = slprintf(buf, 127, MHASH_%s, algorithm.mhash_name,
strlen(algorithm.mhash_name));
zend_register_long_constant(buf, len + 1, algorithm.value,
CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
}
+
+ zend_register_module_ex(mhash_module_entry TSRMLS_CC);
}
PHP_FUNCTION(mhash)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
None at the moment, but this is mainly for Windows. Most of the other platforms have these functions already. Derick mentioend XDebug is already implementing this within its own extension code and perhaps there are more that want to use sprintf but don't know the size of the output to allocate. Scott On 27 Nov 2008, at 21:10, Ilia Alshanetsky wrote: Do we have other extensions using libmagic other then fileinfo? Otherwise, could we not solve it with define flags for fileinfo extension? On 27-Nov-08, at 3:40 PM, Scott MacVicar wrote: On 27 Nov 2008, at 20:33, Ilia Alshanetsky wrote: Is there a reason you do not want to use PHP wrappers allocation protection? On 27-Nov-08, at 2:45 PM, Scott MacVicar wrote: scottmacThu Nov 27 19:45:16 2008 UTC Modified files: /php-srcconfigure.in /php-src/ext/fileinfo/libmagic print.c /php-src/main snprintf.c snprintf.h Log: Add asprintf, use regular system malloc and free and add checks in configure.in for the functions Ilia Alshanetsky If you didn't realise you were using a PHP version and used a free() as you'd expect to work then you'd get the memory manager complaining later on. Scott Ilia Alshanetsky -- 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 configure.in /main php_version.h
iliaa Thu Nov 27 21:21:42 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: 5.2.7RC5 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1336r2=1.2027.2.547.2.1337diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1336 php-src/NEWS:1.2027.2.547.2.1337 --- php-src/NEWS:1.2027.2.547.2.1336Thu Nov 27 17:29:20 2008 +++ php-src/NEWSThu Nov 27 21:21:41 2008 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? Nov 2008, PHP 5.2.7 +27 Nov 2008, PHP 5.2.7RC5 - Upgraded PCRE to version 7.8 (Fixes CVE-2008-2371) (Ilia) - Fixed a crash inside gd with invalid fonts (Fixes CVE-2008-3658). (Pierre) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.113r2=1.579.2.52.2.114diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.113 php-src/configure.in:1.579.2.52.2.114 --- php-src/configure.in:1.579.2.52.2.113 Fri Nov 21 00:12:18 2008 +++ php-src/configure.inThu Nov 27 21:21:42 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.113 2008/11/21 00:12:18 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.114 2008/11/27 21:21:42 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=7 -PHP_EXTRA_VERSION=RC5-dev +PHP_EXTRA_VERSION=RC5 PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.77r2=1.112.2.37.2.78diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.77 php-src/main/php_version.h:1.112.2.37.2.78 --- php-src/main/php_version.h:1.112.2.37.2.77 Fri Nov 21 00:12:18 2008 +++ php-src/main/php_version.h Thu Nov 27 21:21:42 2008 @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 7 -#define PHP_EXTRA_VERSION RC5-dev -#define PHP_VERSION 5.2.7RC5-dev +#define PHP_EXTRA_VERSION RC5 +#define PHP_VERSION 5.2.7RC5 #define PHP_VERSION_ID 50207 -- 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 configure.in /main php_version.h
iliaa Thu Nov 27 21:28:37 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1337r2=1.2027.2.547.2.1338diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1337 php-src/NEWS:1.2027.2.547.2.1338 --- php-src/NEWS:1.2027.2.547.2.1337Thu Nov 27 21:21:41 2008 +++ php-src/NEWSThu Nov 27 21:28:36 2008 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? Dec 2008, PHP 5.2.7 + 27 Nov 2008, PHP 5.2.7RC5 - Upgraded PCRE to version 7.8 (Fixes CVE-2008-2371) (Ilia) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.114r2=1.579.2.52.2.115diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.114 php-src/configure.in:1.579.2.52.2.115 --- php-src/configure.in:1.579.2.52.2.114 Thu Nov 27 21:21:42 2008 +++ php-src/configure.inThu Nov 27 21:28:37 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.114 2008/11/27 21:21:42 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.115 2008/11/27 21:28:37 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=7 -PHP_EXTRA_VERSION=RC5 +PHP_EXTRA_VERSION=RC6-dev PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.78r2=1.112.2.37.2.79diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.78 php-src/main/php_version.h:1.112.2.37.2.79 --- php-src/main/php_version.h:1.112.2.37.2.78 Thu Nov 27 21:21:42 2008 +++ php-src/main/php_version.h Thu Nov 27 21:28:37 2008 @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 7 -#define PHP_EXTRA_VERSION RC5 -#define PHP_VERSION 5.2.7RC5 +#define PHP_EXTRA_VERSION RC6-dev +#define PHP_VERSION 5.2.7RC6-dev #define PHP_VERSION_ID 50207 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/hash config.w32
pajoye Thu Nov 27 21:57:16 2008 UTC
Modified files:
/php-src/ext/hash config.w32
Log:
- fix build..
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/config.w32?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/hash/config.w32
diff -u php-src/ext/hash/config.w32:1.10 php-src/ext/hash/config.w32:1.11
--- php-src/ext/hash/config.w32:1.10Sat Jun 28 15:30:45 2008
+++ php-src/ext/hash/config.w32 Thu Nov 27 21:57:15 2008
@@ -1,7 +1,8 @@
-// $Id: config.w32,v 1.10 2008/06/28 15:30:45 scottmac Exp $
+// $Id: config.w32,v 1.11 2008/11/27 21:57:15 pajoye Exp $
// vim:ft=javascript
ARG_ENABLE(hash, enable hash support, yes);
+ARG_WITH(mhash, mhash support, no);
if (PHP_MHASH != no) {
if (PHP_HASH == no) {
@@ -10,7 +11,6 @@
AC_DEFINE('PHP_MHASH_BC', 1);
}
-
if (PHP_HASH != no) {
AC_DEFINE('HAVE_HASH_EXT', 1);
EXTENSION(hash, hash.c hash_md.c hash_sha.c hash_ripemd.c
hash_haval.c
--
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/hash config.w32
pajoye Thu Nov 27 21:58:38 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/hash config.w32
Log:
- MFH: fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/config.w32?r1=1.8.2.3.4.1r2=1.8.2.3.4.2diff_format=u
Index: php-src/ext/hash/config.w32
diff -u php-src/ext/hash/config.w32:1.8.2.3.4.1
php-src/ext/hash/config.w32:1.8.2.3.4.2
--- php-src/ext/hash/config.w32:1.8.2.3.4.1 Sat Jun 28 15:31:50 2008
+++ php-src/ext/hash/config.w32 Thu Nov 27 21:58:38 2008
@@ -1,7 +1,8 @@
-// $Id: config.w32,v 1.8.2.3.4.1 2008/06/28 15:31:50 scottmac Exp $
+// $Id: config.w32,v 1.8.2.3.4.2 2008/11/27 21:58:38 pajoye Exp $
// vim:ft=javascript
ARG_ENABLE(hash, enable hash support, yes);
+ARG_WITH(mhash, mhash support, no);
if (PHP_MHASH != no) {
if (PHP_HASH == no) {
--
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
stasThu Nov 27 23:51:45 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: report fix http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1338r2=1.2027.2.547.2.1339diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1338 php-src/NEWS:1.2027.2.547.2.1339 --- php-src/NEWS:1.2027.2.547.2.1338Thu Nov 27 21:28:36 2008 +++ php-src/NEWSThu Nov 27 23:51:45 2008 @@ -8,6 +8,8 @@ - Fixed a crash inside gd with invalid fonts (Fixes CVE-2008-3658). (Pierre) - Fixed a possible overflow inside memnstr (Fixes CVE-2008-3659). (Laurent Gaffie) +- Fixed incorrect php_value order for Apache configuration, reported by + Maksymilian Arciemowicz. (Stas) - Fixed memory leak inside readline_callback_handler_remove() function. (Felipe) - Fixed bug #46696 (cURL fails in upload files with specified content-type). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
scottmacThu Nov 27 08:41:31 2008 UTC Modified files: /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: Update libsqlite to 3.6.6.2 http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.12r2=1.13diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.12 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.13 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.12Tue Nov 25 23:53:33 2008 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Thu Nov 27 08:40:50 2008 @@ -4,7 +4,7 @@ /** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.6.6.1. By combining all the individual C code files into this +** version 3.6.6.2. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a one translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -21,7 +21,7 @@ ** is also in a separate file. This file contains only code for the core ** SQLite library. ** -** This amalgamation was generated on 2008-11-22 14:31:32 UTC. +** This amalgamation was generated on 2008-11-26 17:54:40 UTC. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -45,7 +45,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -74,7 +74,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ /* @@ -487,7 +487,7 @@ ** the version number) and changes its name to sqlite3.h as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -564,7 +564,7 @@ ** with the value (X*100 + Y*1000 + Z) where X, Y, and Z ** are the major version, minor version, and release number. */ -#define SQLITE_VERSION 3.6.6.1 +#define SQLITE_VERSION 3.6.6.2 #define SQLITE_VERSION_NUMBER 3006006 /* @@ -7202,7 +7202,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -7753,7 +7753,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -7984,7 +7984,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -8375,7 +8375,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ #ifndef _PAGER_H_ @@ -8521,7 +8521,7 @@ ** This header file defines the interface that the sqlite page cache ** subsystem. ** -** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ #ifndef _PCACHE_H_ @@ -8689,7 +8689,7 @@ ** This header file is #include-ed by sqliteInt.h and thus ends up ** being included by every source file. ** -** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ #ifndef _SQLITE_OS_H_ #define _SQLITE_OS_H_ @@ -8971,7 +8971,7 @@ ** Source files should #include the sqliteInt.h file and let that file ** include this one indirectly. ** -** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ @@ -11071,7 +11071,7 @@ ** ** This file contains definitions of global variables and contants. ** -** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $ +** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $ */ @@ -11159,7 +11159,7 @@ ** This module implements the sqlite3_status() interface and related **
