[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed May 7 01:31:44 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1293r2=1.1294diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1293 ZendEngine2/ChangeLog:1.1294 --- ZendEngine2/ChangeLog:1.1293Tue May 6 01:31:45 2008 +++ ZendEngine2/ChangeLog Wed May 7 01:31:43 2008 @@ -1,3 +1,26 @@ +2008-05-06 Dmitry Stogov [EMAIL PROTECTED] + +* zend_execute_API.c + zend_execute_API.c: + Use lazy symbol table initialization for op_arrays called from internal php + functions + +* zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h: + Fixed possible memory leak + +* zend_execute.c + zend_execute.c + zend_execute_API.c + zend_execute_API.c: + GC fix + +* (PHP_5_3) + zend_vm_execute.h: + Regenerate zend_vm_execute.h + 2008-05-05 Dmitry Stogov [EMAIL PROTECTED] * (PHP_5_3) @@ -22828,7 +22851,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1293 2008/05/06 01:31:45 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1294 2008/05/07 01:31:43 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -24552,7 +24575,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1293 2008/05/06 01:31:45 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1294 2008/05/07 01:31:43 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard math.c
kalle Tue May 6 10:55:50 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/standard math.c
Log:
* Changed php_*h() to be static
* Changed NEWS entry to be say 'native' insted of 'Windows' (ref. *h())
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.175r2=1.2027.2.547.2.965.2.176diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.175
php-src/NEWS:1.2027.2.547.2.965.2.176
--- php-src/NEWS:1.2027.2.547.2.965.2.175 Mon May 5 11:03:32 2008
+++ php-src/NEWSTue May 6 10:55:49 2008
@@ -1,4 +1,4 @@
-PHP
NEWS
+PHPNEWS
|||
?? ??? 20??, PHP 5.3.0
- Removed the experimental RPL (master/slave) functions from mysqli. (Andrey)
@@ -106,7 +106,7 @@
- Added request_order INI variable to control specifically $_REQUEST
behavior. (Stas)
- Added forward_static_call(_array) to complete LSB. (Mike Lively)
-- Added Windows support for asinh(), acosh(), atanh(), log1p() and expm1()
(Kalle)
+- Added native support for asinh(), acosh(), atanh(), log1p() and expm1()
(Kalle)
- Improved PHP runtime speed and memory usage:
. Use ZEND_FREE() opcode instead of ZEND_SWITCH_FREE(IS_TMP_VAR). (Dmitry)
@@ -136,7 +136,7 @@
. Allowed using full path to load modules using extension directive
. Allowed ini-variables to be used almost everywhere ini php.ini files
. Allowed using alphanumeric/variable indexes in array ini options
- . Added 3rd optional parameter to parse_ini_file() to specify the scanning
+ . Added 3rd optional parameter to pars,_ini_file() to specify the scanning
mode of INI_SCANNER_NORMAL or INI_SCANNER_RAW. In raw mode option values
and section values are treated as-is
. Fixed get_cfg_var() to be able to return array ini options
@@ -209,7 +209,7 @@
(Dmitry)
- Fixed bug #42868 (Floats cast to integer produce unpredictable results).
(Zoe Slattery)
-- Fixed bug #42848 (Status: header incorrect under FastCGI). (Dmitry)
+- Fixed bug #42848 (Status: header incorrect under FastCGI). (Dm,try)
- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
- Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines).
(Nuno)
- Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
@@ -286,7 +286,7 @@
- Added persistent connection status checker to pdo_pgsql.
(Elvis Pranskevichus, Ilia)
- Added support for ATTR_TIMEOUT inside pdo_pgsql driver. (Ilia)
-- Added php_ini_loaded_file() function which returns the path to the actual
+- Added php_ini_loaded_file() function which r,turns the path to the actual
php.ini in use. (Jani)
- Added GD version constants GD_MAJOR_VERSION, GD_MINOR_VERSION,
GD_RELEASE_VERSION, GD_EXTRA_VERSION and GD_VERSION_STRING. (Pierre)
@@ -358,7 +358,7 @@
- Fixed bug #42242 (sybase_connect() crashes). (Ilia)
- Fixed bug #42237 (stream_copy_to_stream returns invalid values for mmaped
streams). (andrew dot minerd at sellingsource dot com, Ilia)
-- Fixed bug #42233 (Problems with æøå in extract()). (Jani)
+- Fixed bug #42233 (Problems with æøå in extract()). (Jani)
- Fixed bug #4 (possible buffer overflow in php_openssl_make_REQ). (Pierre)
- Fixed bug #42211 (property_exists() fails to find protected properties
from a parent class). (Dmitry)
@@ -436,7 +436,7 @@
- Fixed bug #41795 (checkdnsrr does not support DNS_TXT type).
(lucas at facebook dot com, Tony)
- Fixed bug #41773 (php_strip_whitespace() sends headers with errors
- suppressed). (Tony)
+, suppressed). (Tony)
- Fixed bug #41770 (SSL: fatal protocol error due to buffer issues). (Ilia)
- Fixed bug #41765 (Recode crashes/does not work on amd64).
(nexus at smoula dot net, Stas)
@@ -514,7 +514,7 @@
- Fixed bug #37715 (array pointers resetting on copy). (Dmitry)
- Fixed bug #37273 (Symlinks and mod_files session handler allow open_basedir
bypass). (Ilia)
-- Fixed bug #36492 (Userfilters can leak buckets). (Sara)
+- Fixe, bug #36492 (Userfilters can leak buckets). (Sara)
- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work).
(Jani)
- Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present).
@@ -589,7 +589,7 @@
- Fixed bug #41353 (crash in openssl_pkcs12_read() on invalid input). (Ilia)
- Fixed bug #41351 (Invalid opcode with foreach ($a[] as $b)). (Dmitry, Tony)
- Fixed bug #41347 (checkdnsrr() segfaults on empty hostname). (Scott)
-- Fixed bug #41337 (WSDL parsing doesn't ignore non soap bindings). (Dmitry)
+- Fixed bug #41337 (WSDL parsing doe,n't ignore non soap bindings). (Dmitry)
- Fixed bug #41326 (Writing empty tags with Xmlwriter::WriteElement[ns])
(Pierre)
- Fixed bug #41321 (downgrade read errors in getimagesize() to E_NOTICE).
@@ -669,7 +669,7 @@
[PHP-CVS] cvs: php-src /ext/standard math.c
kalle Tue May 6 10:57:54 2008 UTC
Modified files:
/php-src/ext/standard math.c
Log:
Changed php_*h() + php_log1p() + php_expm1() to be static
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.145r2=1.146diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.145 php-src/ext/standard/math.c:1.146
--- php-src/ext/standard/math.c:1.145 Mon May 5 06:28:03 2008
+++ php-src/ext/standard/math.c Tue May 6 10:57:54 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.145 2008/05/05 06:28:03 kalle Exp $ */
+/* $Id: math.c,v 1.146 2008/05/06 10:57:54 kalle Exp $ */
#include php.h
#include php_math.h
@@ -51,7 +51,7 @@
/* {{{ php_asinh
*/
-double php_asinh(double z)
+static double php_asinh(double z)
{
#ifdef HAVE_ASINH
return(asinh(z));
@@ -63,7 +63,7 @@
/* {{{ php_acosh
*/
-double php_acosh(double x)
+static double php_acosh(double x)
{
#ifdef HAVE_ACOSH
return(acosh(x));
@@ -75,7 +75,7 @@
/* {{{ php_atanh
*/
-double php_atanh(double z)
+static double php_atanh(double z)
{
#ifdef HAVE_ATANH
return(atanh(z));
@@ -87,7 +87,7 @@
/* {{{ php_log1p
*/
-double php_log1p(double x)
+static double php_log1p(double x)
{
#ifdef HAVE_LOG1P
return(log1p(x));
@@ -99,7 +99,7 @@
/* {{{ php_expm1
*/
-double php_expm1(double x)
+static double php_expm1(double x)
{
#if !defined(PHP_WIN32) !defined(NETWARE)
return(expm1(x));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard math.c
On Tue, 6 May 2008, Kalle Sommer Nielsen wrote: kalle Tue May 6 10:55:50 2008 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /php-src/ext/standard math.c Log: * Changed php_*h() to be static * Changed NEWS entry to be say 'native' insted of 'Windows' (ref. *h()) Your patch changes some things in the NEWS file that it shouldn't have done, please double check and fix it. regards, Derick -- Derick Rethans http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- 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
kalle Tue May 6 11:59:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
Log:
Fixed odd errors caused by last commit
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.176r2=1.2027.2.547.2.965.2.177diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.176
php-src/NEWS:1.2027.2.547.2.965.2.177
--- php-src/NEWS:1.2027.2.547.2.965.2.176 Tue May 6 10:55:49 2008
+++ php-src/NEWSTue May 6 11:59:00 2008
@@ -136,7 +136,7 @@
. Allowed using full path to load modules using extension directive
. Allowed ini-variables to be used almost everywhere ini php.ini files
. Allowed using alphanumeric/variable indexes in array ini options
- . Added 3rd optional parameter to pars,_ini_file() to specify the scanning
+ . Added 3rd optional parameter to parse_ini_file() to specify the scanning
mode of INI_SCANNER_NORMAL or INI_SCANNER_RAW. In raw mode option values
and section values are treated as-is
. Fixed get_cfg_var() to be able to return array ini options
@@ -209,7 +209,7 @@
(Dmitry)
- Fixed bug #42868 (Floats cast to integer produce unpredictable results).
(Zoe Slattery)
-- Fixed bug #42848 (Status: header incorrect under FastCGI). (Dm,try)
+- Fixed bug #42848 (Status: header incorrect under FastCGI). (Dmitry)
- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
- Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines).
(Nuno)
- Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
@@ -286,7 +286,7 @@
- Added persistent connection status checker to pdo_pgsql.
(Elvis Pranskevichus, Ilia)
- Added support for ATTR_TIMEOUT inside pdo_pgsql driver. (Ilia)
-- Added php_ini_loaded_file() function which r,turns the path to the actual
+- Added php_ini_loaded_file() function which returns the path to the actual
php.ini in use. (Jani)
- Added GD version constants GD_MAJOR_VERSION, GD_MINOR_VERSION,
GD_RELEASE_VERSION, GD_EXTRA_VERSION and GD_VERSION_STRING. (Pierre)
@@ -436,7 +436,7 @@
- Fixed bug #41795 (checkdnsrr does not support DNS_TXT type).
(lucas at facebook dot com, Tony)
- Fixed bug #41773 (php_strip_whitespace() sends headers with errors
-, suppressed). (Tony)
+ suppressed). (Tony)
- Fixed bug #41770 (SSL: fatal protocol error due to buffer issues). (Ilia)
- Fixed bug #41765 (Recode crashes/does not work on amd64).
(nexus at smoula dot net, Stas)
@@ -514,7 +514,7 @@
- Fixed bug #37715 (array pointers resetting on copy). (Dmitry)
- Fixed bug #37273 (Symlinks and mod_files session handler allow open_basedir
bypass). (Ilia)
-- Fixe, bug #36492 (Userfilters can leak buckets). (Sara)
+- Fixed bug #36492 (Userfilters can leak buckets). (Sara)
- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work).
(Jani)
- Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present).
@@ -589,7 +589,7 @@
- Fixed bug #41353 (crash in openssl_pkcs12_read() on invalid input). (Ilia)
- Fixed bug #41351 (Invalid opcode with foreach ($a[] as $b)). (Dmitry, Tony)
- Fixed bug #41347 (checkdnsrr() segfaults on empty hostname). (Scott)
-- Fixed bug #41337 (WSDL parsing doe,n't ignore non soap bindings). (Dmitry)
+- Fixed bug #41337 (WSDL parsing doesn't ignore non soap bindings). (Dmitry)
- Fixed bug #41326 (Writing empty tags with Xmlwriter::WriteElement[ns])
(Pierre)
- Fixed bug #41321 (downgrade read errors in getimagesize() to E_NOTICE).
@@ -669,7 +669,7 @@
- Fixed possible multi bytes issues in openssl csr parser (Pierre)
- Fixed shmop_open() with IPC_CREAT|IPC_EXCL flags on Windows.
(Vladimir Kamaev, Tony).
-- Fixed possible lea, in ZipArchive::extractTo when safemode checks fails
(Ilia)
+- Fixed possible leak in ZipArchive::extractTo when safemode checks fails
(Ilia)
- Fixed possible relative path issues in zip_open and TS mode (old API)
(Pierre)
- Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
- Fixed a thread safety issue in gd gif read code (Nuno, Roman Nemecek)
@@ -742,7 +742,7 @@
dynamic properties). (Tony)
- Fixed bug #40784 (Case sensitivity in constructor's fallback). (Tony)
- Fixed bug #40770 (Apache child exits when PHP memory limit reached). (Dmitry)
-- Fix,d bug #40764 (line thickness not respected for horizontal and vertical
+- Fixed bug #40764 (line thickness not respected for horizontal and vertical
lines). (Pierre)
- Fixed bug #40758 (Test fcgi_is_fastcgi() is wrong on windows). (Dmitry)
- Fixed bug #40754 (added substr() substr_replace() overflow checks). (Ilia)
@@ -813,7 +813,7 @@
- Implement #39867 (openssl PKCS#12 support) (Marc Delling, Pierre)
- Fixed bug #39836 (SplObjectStorage empty after unserialize). (Marcus)
- Fixed bug #39416 (Milliseconds in date()). (Derick)
-- Fixed bug #39396 (stream_set_blocking crashes on Win32). (Ilia, maur,ce at
+- Fixed bug #39396 (stream_set_blocking crashes on Win32). (Ilia, maurice at
iceblog dot de)
- Fixed
Re: [PHP-CVS] cvs: php-src /ext/standard basic_functions.c math.c php_math.h /ext/standard/tests/math acosh_basic.phpt acosh_error.phpt acosh_variation.phpt asinh_basic.phpt asinh_error.phpt asinh_va
Quoting Nuno Lopes [EMAIL PROTECTED]: Please add the 'static' qualifier to your new php_* functions. Thanks, Nuno - Original Message - From: Kalle Sommer Nielsen [EMAIL PROTECTED] To: php-cvs@lists.php.net; [EMAIL PROTECTED] Sent: Monday, May 05, 2008 7:28 AM Subject: [PHP-CVS] cvs: php-src /ext/standard basic_functions.c math.c php_math.h /ext/standard/tests/math acosh_basic.phpt acosh_error.phpt acosh_variation.phpt asinh_basic.phpt asinh_error.phpt asinh_variation.phpt atanh_basic.phpt atanh_error.phpt atanh_variation.phpt kalle Mon May 5 06:28:03 2008 UTC Modified files: /php-src/ext/standard basic_functions.c math.c php_math.h /php-src/ext/standard/tests/math acosh_basic.phpt acosh_error.phpt acosh_variation.phpt asinh_basic.phpt asinh_error.phpt asinh_variation.phpt atanh_basic.phpt atanh_error.phpt atanh_variation.phpt Log: Implemented Windows support for asinh(), acosh(), atanh(), log1p() and expm1() + removed Windows check on tests [DOC] Windows support for asinh(), acosh(), atanh(), log1p() and expm1() Done and thanks for the reminder =) Kalle Sommer Nielsen Danmarks Radio - www.dr.dk -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
Quoting Antony Dovgal [EMAIL PROTECTED]: On 05.05.2008 11:29, Kalle Sommer Nielsen wrote: kalle Mon May 5 07:29:42 2008 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /php-src/ext/standard basic_functions.c math.c php_math.h /php-src/ext/standard/tests/math acosh_basic.phpt acosh_error.phpt acosh_variation.phpt asinh_basic.phpt asinh_error.phpt asinh_variation.phpt atanh_basic.phpt atanh_error.phpt atanh_variation.phpt Log: Merge PHP_5_3 - Implemented Windows support for asinh(), acosh(), atanh(), log1p() and expm1() From what I understood, Windows has nothing to do with this, it was just one of the platforms missing these functions. So it should be made functions X,Y,Z available on all platforms, not implemented functions on Windows, because Windows is no special here. -- Wbr, Antony Dovgal Changed it to native =) Kalle Sommer Nielsen Danmarks Radio - www.dr.dk -- 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/mysqli mysqli.c mysqli_nonapi.c
andrey Tue May 6 17:05:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c mysqli_nonapi.c
Log:
Make mysqli compilable in a 5_2 environment. Some want to use mysqlnd+mysqli
with 5_2. This won't hurt 5_2 in any way. Won't be MFB-ed because HEAD is
completely different.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.23r2=1.72.2.16.2.17.2.24diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.23
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.24
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.23 Tue Mar 18 17:30:55 2008
+++ php-src/ext/mysqli/mysqli.c Tue May 6 17:05:14 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.23 2008/03/18 17:30:55 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.24 2008/05/06 17:05:14 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -512,6 +512,7 @@
} /* }}} */
+#if PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION = 3
HashTable * mysqli_object_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
{
mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object
TSRMLS_CC);
@@ -539,7 +540,7 @@
*is_temp = 1;
return retval;
}
-
+#endif
/* {{{ mysqli_objects_new
*/
@@ -708,7 +709,9 @@
mysqli_object_handlers.get_property_ptr_ptr =
std_hnd-get_property_ptr_ptr;
mysqli_object_handlers.get_constructor = php_mysqli_constructor_get;
mysqli_object_handlers.has_property = mysqli_object_has_property;
+#if PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION = 3
mysqli_object_handlers.get_debug_info = mysqli_object_get_debug_info;
+#endif
zend_hash_init(classes, 0, NULL, NULL, 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.11r2=1.54.2.7.2.5.2.12diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.11
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.12
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.11Thu Apr 24
14:22:19 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue May 6 17:05:14 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.11 2008/04/24 14:22:19 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.12 2008/05/06 17:05:14 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -33,6 +33,11 @@
#define SAFE_STR(a) ((a)?a:)
+#ifndef zend_parse_parameters_none
+#define zend_parse_parameters_none() \
+zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, )
+#endif
+
/* {{{ php_mysqli_set_error
*/
static void php_mysqli_set_error(long mysql_errno, char *mysql_err TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c
iliaa Tue May 6 18:01:36 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c
Log:
Fixed bug #44836 (putenv() crashes, avoid direct reference of environ in
POSIX systems)
# Original patch by delphij at FreeBSD dot org
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.31r2=1.725.2.31.2.64.2.32diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.31
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.32
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.31 Mon May 5
11:28:11 2008
+++ php-src/ext/standard/basic_functions.c Tue May 6 18:01:32 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.31 2008/05/05 11:28:11 tony2001
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.32 2008/05/06 18:01:32 iliaa Exp
$ */
#include php.h
#include php_streams.h
@@ -3820,9 +3820,7 @@
SetEnvironmentVariable(pe-key, bugbug);
#endif
putenv(pe-previous_value);
-# if defined(PHP_WIN32)
efree(pe-previous_value);
-# endif
} else {
# if HAVE_UNSETENV
unsetenv(pe-key);
@@ -4427,12 +4425,8 @@
pe.previous_value = NULL;
for (env = environ; env != NULL *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len)
(*env)[pe.key_len] == '=') { /* found it */
-#if defined(PHP_WIN32)
- /* must copy previous value because MSVCRT's
putenv can free the string without notice */
+ /* must copy previous value because putenv can
free the string without notice */
pe.previous_value = estrdup(*env);
-#else
- pe.previous_value = *env;
-#endif
break;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard basic_functions.c
iliaa Tue May 6 18:03:52 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c
/php-srcNEWS
Log:
MFB: Fixed bug #44836 (putenv() crashes, avoid direct reference of environ
in POSIX systems).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.69r2=1.725.2.31.2.70diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.69
php-src/ext/standard/basic_functions.c:1.725.2.31.2.70
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.69 Thu Mar 20
00:55:26 2008
+++ php-src/ext/standard/basic_functions.c Tue May 6 18:03:51 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.69 2008/03/20 00:55:26 dsp Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.70 2008/05/06 18:03:51 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -3859,9 +3859,7 @@
SetEnvironmentVariable(pe-key, bugbug);
#endif
putenv(pe-previous_value);
-# if defined(PHP_WIN32)
efree(pe-previous_value);
-# endif
} else {
# if HAVE_UNSETENV
unsetenv(pe-key);
@@ -4461,12 +4459,8 @@
pe.previous_value = NULL;
for (env = environ; env != NULL *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len)
(*env)[pe.key_len] == '=') { /* found it */
-#if defined(PHP_WIN32)
- /* must copy previous value because MSVCRT's
putenv can free the string without notice */
+ /* must copy previous value because putenv can
free the string without notice */
pe.previous_value = estrdup(*env);
-#else
- pe.previous_value = *env;
-#endif
break;
}
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1151r2=1.2027.2.547.2.1152diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1151 php-src/NEWS:1.2027.2.547.2.1152
--- php-src/NEWS:1.2027.2.547.2.1151Mon May 5 23:00:12 2008
+++ php-src/NEWSTue May 6 18:03:52 2008
@@ -5,8 +5,11 @@
functions. (Andrey)
- Fixed bug #44891 Memory leak using registerPHPFunctions and XSLT Variable
as function parameter. (Rob)
+- Fixed bug #44836 (putenv() crashes, avoid direct reference of environ in
+ POSIX systems). (Ilia, delphij at FreeBSD dot org)
- Fixed bug #44798 (Memory leak assigning value to attribute). (Ilia)
+
01 May 2008, PHP 5.2.6
- Fixed two possible crashes inside posix extension (Tony)
- Fixed incorrect heredoc handling when label is used within the block.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
iliaa Tue May 6 18:04:25 2008 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
MFB: Fixed bug #44836 (putenv() crashes, avoid direct reference of environ
in POSIX systems).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.897r2=1.898diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.897
php-src/ext/standard/basic_functions.c:1.898
--- php-src/ext/standard/basic_functions.c:1.897Mon May 5 06:28:03 2008
+++ php-src/ext/standard/basic_functions.c Tue May 6 18:04:25 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.897 2008/05/05 06:28:03 kalle Exp $ */
+/* $Id: basic_functions.c,v 1.898 2008/05/06 18:04:25 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -3822,9 +3822,7 @@
SetEnvironmentVariable(pe-key, bugbug);
#endif
putenv(pe-previous_value);
-# if defined(PHP_WIN32)
efree(pe-previous_value);
-# endif
} else {
# if HAVE_UNSETENV
unsetenv(pe-key);
@@ -4388,12 +4386,8 @@
pe.previous_value = NULL;
for (env = environ; env != NULL *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len)
(*env)[pe.key_len] == '=') { /* found it */
-#if defined(PHP_WIN32)
- /* must copy previous value because MSVCRT's
putenv can free the string without notice */
+ /* must copy previous value because putenv can
free the string without notice */
pe.previous_value = estrdup(*env);
-#else
- pe.previous_value = *env;
-#endif
break;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue May 6 20:28:15 2008 UTC Modified files: /CVSROOTavail Log: - gd karma for Kalle http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1391r2=1.1392diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1391 CVSROOT/avail:1.1392 --- CVSROOT/avail:1.1391Mon May 5 06:01:12 2008 +++ CVSROOT/avail Tue May 6 20:28:15 2008 @@ -325,7 +325,7 @@ # Please ask [EMAIL PROTECTED] before adding some unknown guys :) # gd/libgd is the library itself, other directories are for # the various tools (website, bugs,...) -avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias,kshepherd,chapg|gd +avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias,kshepherd,chapg,kalle|gd avail|mattias|php-src/ext/gd # bindlib_w32 karma -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_array.c
colder Tue May 6 22:59:59 2008 UTC
Modified files:
/php-src/ext/splspl_array.c
Log:
Add a flag that defines whether the objects should get iterated through or not
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.137r2=1.138diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.137 php-src/ext/spl/spl_array.c:1.138
--- php-src/ext/spl/spl_array.c:1.137 Mon Feb 4 16:47:06 2008
+++ php-src/ext/spl/spl_array.c Tue May 6 22:59:59 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.137 2008/02/04 16:47:06 helly Exp $ */
+/* $Id: spl_array.c,v 1.138 2008/05/06 22:59:59 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -47,6 +47,7 @@
#define SPL_ARRAY_STD_PROP_LIST 0x0001
#define SPL_ARRAY_ARRAY_AS_PROPS 0x0002
+#define SPL_ARRAY_CHILD_ARRAYS_ONLY 0x0004
#define SPL_ARRAY_OVERLOADED_REWIND 0x0001
#define SPL_ARRAY_OVERLOADED_VALID 0x0002
#define SPL_ARRAY_OVERLOADED_KEY 0x0004
@@ -122,7 +123,7 @@
zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval
*object, int by_ref TSRMLS_DC);
-/* {{{ spl_array_object_new */
+/* {{{ spl_array_object_new_ex */
static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type,
spl_array_object **obj, zval *orig, int clone_orig TSRMLS_DC)
{
zend_object_value retval;
@@ -1391,7 +1392,7 @@
RETURN_FALSE;
}
- RETURN_BOOL(Z_TYPE_PP(entry) == IS_ARRAY || Z_TYPE_PP(entry) ==
IS_OBJECT);
+ RETURN_BOOL(Z_TYPE_PP(entry) == IS_ARRAY || (Z_TYPE_PP(entry) ==
IS_OBJECT (intern-ar_flags SPL_ARRAY_CHILD_ARRAYS_ONLY) == 0));
}
/* }}} */
@@ -1417,12 +1418,18 @@
return;
}
- if (Z_TYPE_PP(entry) == IS_OBJECT
instanceof_function(Z_OBJCE_PP(entry), intern-std.ce TSRMLS_CC)) {
- RETURN_ZVAL(*entry, 0, 0);
+ if (Z_TYPE_PP(entry) == IS_OBJECT) {
+ if ((intern-ar_flags SPL_ARRAY_CHILD_ARRAYS_ONLY) != 0) {
+ return;
+ }
+ if (instanceof_function(Z_OBJCE_PP(entry), Z_OBJCE_P(getThis())
TSRMLS_CC)) {
+ RETURN_ZVAL(*entry, 0, 0);
+ }
}
- MAKE_STD_ZVAL(flags);
- ZVAL_LONG(flags, SPL_ARRAY_USE_OTHER);
+ MAKE_STD_ZVAL(flags);
+ ZVAL_LONG(flags, SPL_ARRAY_USE_OTHER | intern-ar_flags);
+
spl_instantiate_arg_ex2(intern-std.ce, return_value, 0, *entry, flags
TSRMLS_CC);
zval_ptr_dtor(flags);
}
@@ -1730,6 +1737,9 @@
REGISTER_SPL_CLASS_CONST_LONG(ArrayIterator, STD_PROP_LIST,
SPL_ARRAY_STD_PROP_LIST);
REGISTER_SPL_CLASS_CONST_LONG(ArrayIterator, ARRAY_AS_PROPS,
SPL_ARRAY_ARRAY_AS_PROPS);
+
+ REGISTER_SPL_CLASS_CONST_LONG(RecursiveArrayIterator,
CHILD_ARRAYS_ONLY, SPL_ARRAY_CHILD_ARRAYS_ONLY);
+
return SUCCESS;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_array.c /ext/spl/tests bug38618.phpt
colder Tue May 6 23:08:07 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_array.c
/php-src/ext/spl/tests bug38618.phpt
Log:
Add consistency with the flag
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.13r2=1.71.2.17.2.13.2.14diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.13
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.14
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.13 Mon Feb 4 16:48:06 2008
+++ php-src/ext/spl/spl_array.c Tue May 6 23:08:06 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.13 2008/02/04 16:48:06 helly Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.14 2008/05/06 23:08:06 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -947,9 +947,6 @@
if (Z_TYPE_PP(array) == IS_ARRAY) {
SEPARATE_ZVAL_IF_NOT_REF(array);
- if (ZEND_NUM_ARGS() 2) {
- ar_flags |= SPL_ARRAY_CHILD_ARRAYS_ONLY;
- }
}
if (ZEND_NUM_ARGS() 2) {
@@ -1737,11 +1734,12 @@
REGISTER_SPL_CLASS_CONST_LONG(ArrayObject, STD_PROP_LIST,
SPL_ARRAY_STD_PROP_LIST);
REGISTER_SPL_CLASS_CONST_LONG(ArrayObject, ARRAY_AS_PROPS,
SPL_ARRAY_ARRAY_AS_PROPS);
- REGISTER_SPL_CLASS_CONST_LONG(ArrayObject,
CHILD_ARRAYS_ONLY,SPL_ARRAY_CHILD_ARRAYS_ONLY);
REGISTER_SPL_CLASS_CONST_LONG(ArrayIterator, STD_PROP_LIST,
SPL_ARRAY_STD_PROP_LIST);
REGISTER_SPL_CLASS_CONST_LONG(ArrayIterator, ARRAY_AS_PROPS,
SPL_ARRAY_ARRAY_AS_PROPS);
- REGISTER_SPL_CLASS_CONST_LONG(ArrayIterator,
CHILD_ARRAYS_ONLY,SPL_ARRAY_CHILD_ARRAYS_ONLY);
+
+ REGISTER_SPL_CLASS_CONST_LONG(RecursiveArrayIterator,
CHILD_ARRAYS_ONLY, SPL_ARRAY_CHILD_ARRAYS_ONLY);
+
return SUCCESS;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug38618.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/spl/tests/bug38618.phpt
diff -u php-src/ext/spl/tests/bug38618.phpt:1.1.2.1
php-src/ext/spl/tests/bug38618.phpt:1.1.2.2
--- php-src/ext/spl/tests/bug38618.phpt:1.1.2.1 Wed Dec 5 15:56:41 2007
+++ php-src/ext/spl/tests/bug38618.phpt Tue May 6 23:08:06 2008
@@ -81,8 +81,8 @@
test_array($array, 'Protected Property');
-test_array($array, 'Public Property New', ArrayIterator::CHILD_ARRAYS_ONLY);
-test_array($array, 'Protected Property New', ArrayIterator::CHILD_ARRAYS_ONLY);
+test_array($array, 'Public Property New',
RecursiveArrayIterator::CHILD_ARRAYS_ONLY);
+test_array($array, 'Protected Property New',
RecursiveArrayIterator::CHILD_ARRAYS_ONLY);
?
===DONE===
?php exit(0); ?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
