[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/zip/ php_zip.c
rasmus Mon, 15 Nov 2010 09:04:27 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305351
Log:
ws fix
Changed paths:
U php/php-src/branches/PHP_5_3/ext/zip/php_zip.c
Modified: php/php-src/branches/PHP_5_3/ext/zip/php_zip.c
===
--- php/php-src/branches/PHP_5_3/ext/zip/php_zip.c 2010-11-15 08:00:42 UTC
(rev 305350)
+++ php/php-src/branches/PHP_5_3/ext/zip/php_zip.c 2010-11-15 09:04:27 UTC
(rev 305351)
@@ -2363,12 +2363,12 @@
RETURN_FALSE;
}
-if (php_stream_stat_path(pathto, ssb) 0) {
-ret = php_stream_mkdir(pathto, 0777, PHP_STREAM_MKDIR_RECURSIVE,
NULL);
-if (!ret) {
-RETURN_FALSE;
-}
-}
+ if (php_stream_stat_path(pathto, ssb) 0) {
+ ret = php_stream_mkdir(pathto, 0777,
PHP_STREAM_MKDIR_RECURSIVE, NULL);
+ if (!ret) {
+ RETURN_FALSE;
+ }
+ }
ZIP_FROM_OBJECT(intern, this);
if (zval_files (Z_TYPE_P(zval_files) != IS_NULL)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/tests/file/ stream_enclosed.phpt
cataphract Mon, 15 Nov 2010 14:51:26 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305371
Log:
- Added test relative to the fix in rev #305346.
Bug: http://bugs.php.net/305346 (error getting bug information)
Changed paths:
A php/php-src/trunk/ext/standard/tests/file/stream_enclosed.phpt
Added: php/php-src/trunk/ext/standard/tests/file/stream_enclosed.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/stream_enclosed.phpt
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/file/stream_enclosed.phpt
2010-11-15 14:51:26 UTC (rev 305371)
@@ -0,0 +1,20 @@
+--TEST--
+Unexposed/leaked stream encloses another stream
+--SKIPIF--
+?php
+if (!function_exists('leak_variable')) die(skip only debug builds);
+--FILE--
+?php
+$s = fopen('php://temp/maxmemory=1024','wb+');
+
+$t = fopen('php://temp/maxmemory=1024','wb+');
+
+/* force conversion of inner stream to STDIO. */
+$i = 0;
+while ($i++ 5000) {
+fwrite($t, str_repeat('a',1024));
+}
+
+leak_variable($s, true);
+leak_variable($t, true);
+--EXPECT--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ UPGRADING.INTERNALS ext/standard/basic_functions.c ext/standard/basic_funct ions.h main/php_streams.h main/streams/memory.c m ain/streams/streams.c
On Mon, 15 Nov 2010 08:25:44 +0100, Kalle Sommer Nielsen ka...@php.net
wrote:
Hi
2010/11/15 Gustavo André dos Santos Lopes cataphr...@php.net:
cataphract Mon, 15 Nov 2010 03:05:32
+
Revision: http://svn.php.net/viewvc?view=revisionrevision=305346
Log:
- Added leak_variable() function.
Why do we need a leak_variable() function in a regular build unlike
leak() and crash() which are defined in zend_builtin_functions.c in
debug mode only or did I miss something here?
It's only in the debug build. In any case, it would be indeed better among
leak() and crash(). The attached patch moves it there, but it will have to
be someone else commiting it.
--
Gustavo LopesIndex: ext/standard/basic_functions.c
===
--- ext/standard/basic_functions.c (revision 305370)
+++ ext/standard/basic_functions.c (working copy)
@@ -853,11 +853,6 @@
#if ZEND_DEBUG
ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_leak_variable, 0, 0, 1)
- ZEND_ARG_INFO(0, variable)
- ZEND_ARG_INFO(0, leak_data)
-ZEND_END_ARG_INFO()
#endif
#ifdef HAVE_GETLOADAVG
@@ -3002,7 +2997,6 @@
PHP_FE(parse_ini_string,arginfo_parse_ini_string)
#if ZEND_DEBUG
PHP_FE(config_get_hash, arginfo_config_get_hash)
- PHP_FE(leak_variable, arginfo_leak_variable)
#endif
PHP_FE(is_uploaded_file,arginfo_is_uploaded_file)
PHP_FE(move_uploaded_file,arginfo_move_uploaded_file)
@@ -5923,32 +5917,6 @@
zend_hash_apply_with_arguments(hash TSRMLS_CC, (apply_func_args_t) add_config_entry_cb, 1, return_value);
}
/* }}} */
-
-/* {{{ proto leak_variable(variable [, leak_data]) */
-PHP_FUNCTION(leak_variable)
-{
- zval *zv;
- zend_bool leak_data = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z|b, zv, leak_data) == FAILURE) {
- return;
- }
-
- if (leak_data (Z_TYPE_P(zv) != IS_RESOURCE Z_TYPE_P(zv) != IS_OBJECT)) {
- php_error_docref0(NULL TSRMLS_CC, E_WARNING,
- Leaking non-zval data is only applicable to resources and objects);
- return;
- }
-
- if (!leak_data) {
- zval_add_ref(zv);
- } else if (Z_TYPE_P(zv) == IS_RESOURCE) {
- zend_list_addref(Z_RESVAL_P(zv));
- } else if (Z_TYPE_P(zv) == IS_OBJECT) {
- Z_OBJ_HANDLER_P(zv, add_ref)(zv TSRMLS_CC);
- }
-}
-/* }}} */
#endif
#ifdef HAVE_GETLOADAVG
Index: ext/standard/basic_functions.h
===
--- ext/standard/basic_functions.h (revision 305370)
+++ ext/standard/basic_functions.h (working copy)
@@ -127,7 +127,6 @@
PHP_FUNCTION(parse_ini_string);
#if ZEND_DEBUG
PHP_FUNCTION(config_get_hash);
-PHP_FUNCTION(leak_variable);
#endif
PHP_FUNCTION(str_rot13);
Index: Zend/zend_builtin_functions.c
===
--- Zend/zend_builtin_functions.c (revision 305370)
+++ Zend/zend_builtin_functions.c (working copy)
@@ -54,6 +54,7 @@
static ZEND_FUNCTION(class_alias);
#if ZEND_DEBUG
static ZEND_FUNCTION(leak);
+static ZEND_FUNCTION(leak_variable);
#ifdef ZEND_TEST_EXCEPTIONS
static ZEND_FUNCTION(crash);
#endif
@@ -180,6 +181,13 @@
ZEND_ARG_INFO(0, autoload)
ZEND_END_ARG_INFO()
+#if ZEND_DEBUG
+ZEND_BEGIN_ARG_INFO_EX(arginfo_leak_variable, 0, 0, 1)
+ ZEND_ARG_INFO(0, variable)
+ ZEND_ARG_INFO(0, leak_data)
+ZEND_END_ARG_INFO()
+#endif
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1)
ZEND_ARG_INFO(0, message)
ZEND_ARG_INFO(0, error_type)
@@ -245,6 +253,7 @@
ZEND_FE(class_alias, arginfo_class_alias)
#if ZEND_DEBUG
ZEND_FE(leak,NULL)
+ ZEND_FE(leak_variable, arginfo_leak_variable)
#ifdef ZEND_TEST_EXCEPTIONS
ZEND_FE(crash,NULL)
#endif
@@ -1367,7 +1376,29 @@
}
/* }}} */
+/* {{{ proto leak_variable(mixed variable [, bool leak_data]) */
+ZEND_FUNCTION(leak_variable)
+{
+ zval *zv;
+ zend_bool leak_data = 0;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z|b, zv, leak_data) == FAILURE) {
+ return;
+ }
+
+ if (!leak_data) {
+ zval_add_ref(zv);
+ } else if (Z_TYPE_P(zv) == IS_RESOURCE) {
+ zend_list_addref(Z_RESVAL_P(zv));
+ } else if (Z_TYPE_P(zv) == IS_OBJECT) {
+ Z_OBJ_HANDLER_P(zv, add_ref)(zv TSRMLS_CC);
+ } else {
+ zend_error(E_WARNING, Leaking non-zval data is only applicable to resources and objects);
+ }
+}
+/* }}} */
+
+
#ifdef ZEND_TEST_EXCEPTIONS
ZEND_FUNCTION(crash)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ Zend/zend_builtin_functions.c ext/standard/basic_functions.c ext/standard/basic_functions.h
felipe Mon, 15 Nov 2010 17:06:27 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305376
Log:
- Moved leak_variable() to zend_builtin_functions.c (Gustavo)
Changed paths:
U php/php-src/trunk/Zend/zend_builtin_functions.c
U php/php-src/trunk/ext/standard/basic_functions.c
U php/php-src/trunk/ext/standard/basic_functions.h
Modified: php/php-src/trunk/Zend/zend_builtin_functions.c
===
--- php/php-src/trunk/Zend/zend_builtin_functions.c 2010-11-15 17:06:07 UTC
(rev 305375)
+++ php/php-src/trunk/Zend/zend_builtin_functions.c 2010-11-15 17:06:27 UTC
(rev 305376)
@@ -54,6 +54,7 @@
static ZEND_FUNCTION(class_alias);
#if ZEND_DEBUG
static ZEND_FUNCTION(leak);
+static ZEND_FUNCTION(leak_variable);
#ifdef ZEND_TEST_EXCEPTIONS
static ZEND_FUNCTION(crash);
#endif
@@ -180,6 +181,13 @@
ZEND_ARG_INFO(0, autoload)
ZEND_END_ARG_INFO()
+#if ZEND_DEBUG
+ZEND_BEGIN_ARG_INFO_EX(arginfo_leak_variable, 0, 0, 1)
+ ZEND_ARG_INFO(0, variable)
+ ZEND_ARG_INFO(0, leak_data)
+ZEND_END_ARG_INFO()
+#endif
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1)
ZEND_ARG_INFO(0, message)
ZEND_ARG_INFO(0, error_type)
@@ -245,6 +253,7 @@
ZEND_FE(class_alias,arginfo_class_alias)
#if ZEND_DEBUG
ZEND_FE(leak, NULL)
+ ZEND_FE(leak_variable, arginfo_leak_variable)
#ifdef ZEND_TEST_EXCEPTIONS
ZEND_FE(crash, NULL)
#endif
@@ -1367,7 +1376,29 @@
}
/* }}} */
+/* {{{ proto leak_variable(mixed variable [, bool leak_data]) */
+ZEND_FUNCTION(leak_variable)
+{
+ zval *zv;
+ zend_bool leak_data = 0;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z|b, zv,
leak_data) == FAILURE) {
+ return;
+ }
+
+ if (!leak_data) {
+ zval_add_ref(zv);
+ } else if (Z_TYPE_P(zv) == IS_RESOURCE) {
+ zend_list_addref(Z_RESVAL_P(zv));
+ } else if (Z_TYPE_P(zv) == IS_OBJECT) {
+ Z_OBJ_HANDLER_P(zv, add_ref)(zv TSRMLS_CC);
+ } else {
+ zend_error(E_WARNING, Leaking non-zval data is only applicable
to resources and objects);
+ }
+}
+/* }}} */
+
+
#ifdef ZEND_TEST_EXCEPTIONS
ZEND_FUNCTION(crash)
{
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2010-11-15 17:06:07 UTC
(rev 305375)
+++ php/php-src/trunk/ext/standard/basic_functions.c2010-11-15 17:06:27 UTC
(rev 305376)
@@ -853,11 +853,6 @@
#if ZEND_DEBUG
ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_leak_variable, 0, 0, 1)
- ZEND_ARG_INFO(0, variable)
- ZEND_ARG_INFO(0, leak_data)
-ZEND_END_ARG_INFO()
#endif
#ifdef HAVE_GETLOADAVG
@@ -3002,7 +2997,6 @@
PHP_FE(parse_ini_string,
arginfo_parse_ini_string)
#if ZEND_DEBUG
PHP_FE(config_get_hash,
arginfo_config_get_hash)
- PHP_FE(leak_variable,
arginfo_leak_variable)
#endif
PHP_FE(is_uploaded_file,
arginfo_is_uploaded_file)
PHP_FE(move_uploaded_file,
arginfo_move_uploaded_file)
@@ -5923,32 +5917,6 @@
zend_hash_apply_with_arguments(hash TSRMLS_CC, (apply_func_args_t)
add_config_entry_cb, 1, return_value);
}
/* }}} */
-
-/* {{{ proto leak_variable(variable [, leak_data]) */
-PHP_FUNCTION(leak_variable)
-{
- zval *zv;
- zend_bool leak_data = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z|b, zv,
leak_data) == FAILURE) {
- return;
- }
-
- if (leak_data (Z_TYPE_P(zv) != IS_RESOURCE Z_TYPE_P(zv) !=
IS_OBJECT)) {
- php_error_docref0(NULL TSRMLS_CC, E_WARNING,
- Leaking non-zval data is only applicable to resources
and objects);
- return;
- }
-
- if (!leak_data) {
- zval_add_ref(zv);
- } else if (Z_TYPE_P(zv) == IS_RESOURCE) {
- zend_list_addref(Z_RESVAL_P(zv));
- } else if (Z_TYPE_P(zv) == IS_OBJECT) {
- Z_OBJ_HANDLER_P(zv, add_ref)(zv TSRMLS_CC);
- }
-}
-/* }}} */
#endif
#ifdef HAVE_GETLOADAVG
Modified: php/php-src/trunk/ext/standard/basic_functions.h
===
---
[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] svn: /php/php-src/trunk/ UPGRADING.INTERNALS ext/standard/basic_functions.c ext/standard/basic_functions.h main/php_streams.h main/streams/memory.c main/streams/s
Em 15 de novembro de 2010 14:49, Gustavo Lopes glo...@nebm.ist.utl.ptescreveu: On Mon, 15 Nov 2010 08:25:44 +0100, Kalle Sommer Nielsen ka...@php.net wrote: Hi 2010/11/15 Gustavo André dos Santos Lopes cataphr...@php.net: cataphract Mon, 15 Nov 2010 03:05:32 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305346 Log: - Added leak_variable() function. Why do we need a leak_variable() function in a regular build unlike leak() and crash() which are defined in zend_builtin_functions.c in debug mode only or did I miss something here? It's only in the debug build. In any case, it would be indeed better among leak() and crash(). The attached patch moves it there, but it will have to be someone else commiting it. Done. -- Regards, Felipe Pena
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt branches/PHP_5_3/main/streams/streams.c trunk/ext/standard/tests/file/bug52820.phpt trunk/main
cataphract Mon, 15 Nov 2010 18:22:52 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305379
Log:
- Fixed bug #52820 (writes to fopencookie FILE* not commited when seeking the
stream).
Bug: http://bugs.php.net/52820 (Assigned) curl doesn't write to php://temp or
/memory
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
A php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt
U php/php-src/branches/PHP_5_3/main/streams/streams.c
A php/php-src/trunk/ext/standard/tests/file/bug52820.phpt
U php/php-src/trunk/main/streams/streams.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-11-15 17:10:32 UTC (rev 305378)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-11-15 18:22:52 UTC (rev 305379)
@@ -122,6 +122,8 @@
mssql_connect). (Felipe)
- Fixed bug #52827 (cURL leaks handle and causes assertion error
(CURLOPT_STDERR)). (Gustavo)
+- Fixed bug #52820 (writes to fopencookie FILE* not commited when seeking the
+ stream). (Gustavo)
- Fixed bug #52786 (PHP should reset section to [PHP] after ini sections).
(Fedora at famillecollet dot com)
- Fixed bug #52784 (Race condition when handling many concurrent signals).
Added: php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt
2010-11-15 18:22:52 UTC (rev 305379)
@@ -0,0 +1,98 @@
+--TEST--
+Bug #52820 (writes to fopencookie FILE* not commited when seeking the stream)
+--SKIPIF--
+?php
+/* unfortunately no standard function does a cast to FILE*, so we need
+ * curl to test this */
+if (!extension_loaded(curl)) exit(skip curl extension not loaded);
+$handle=curl_init('http://127.0.0.1:37349/');
+curl_setopt($handle, CURLOPT_VERBOSE, true);
+curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+if (!curl_setopt($handle, CURLOPT_STDERR, fopen(php://memory, w+)))
+die(skip fopencookie not supported on this platform);
+--FILE--
+?php
+function do_stuff($url) {
+$handle=curl_init('http://127.0.0.1:37349/');
+curl_setopt($handle, CURLOPT_VERBOSE, true);
+curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+curl_setopt($handle, CURLOPT_STDERR, $o = fopen($url, w+));
+curl_exec($handle);
+echo About to rewind!\n;
+rewind($o);
+echo stream_get_contents($o);
+return $o;
+}
+
+echo temp stream (close after):\n;
+fclose(do_stuff(php://temp));
+
+echo \nmemory stream (close after):\n;
+fclose(do_stuff(php://memory));
+
+echo \nDone.\n;
+--EXPECT--
+temp stream (close after):
+About to rewind!
+* About to connect() to 127.0.0.1 port 37349 (#0)
+* Trying 127.0.0.1... * Connection refused
+* couldn't connect to host
+* Closing connection #0
+
+memory stream (close after):
+About to rewind!
+* About to connect() to 127.0.0.1 port 37349 (#0)
+* Trying 127.0.0.1... * Connection refused
+* couldn't connect to host
+* Closing connection #0
+
+Done.
+--TEST--
+Bug #52820 (writes to fopencookie FILE* not commited when seeking the stream)
+--SKIPIF--
+?php
+/* unfortunately no standard function does a cast to FILE*, so we need
+ * curl to test this */
+if (!extension_loaded(curl)) exit(skip curl extension not loaded);
+$handle=curl_init('http://127.0.0.1:37349/');
+curl_setopt($handle, CURLOPT_VERBOSE, true);
+curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+if (!curl_setopt($handle, CURLOPT_STDERR, fopen(php://memory, w+)))
+die(skip fopencookie not supported on this platform);
+--FILE--
+?php
+function do_stuff($url) {
+$handle=curl_init('http://127.0.0.1:37349/');
+curl_setopt($handle, CURLOPT_VERBOSE, true);
+curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+curl_setopt($handle, CURLOPT_STDERR, $o = fopen($url, w+));
+curl_exec($handle);
+echo About to rewind!\n;
+rewind($o);
+echo stream_get_contents($o);
+return $o;
+}
+
+echo temp stream (close after):\n;
+fclose(do_stuff(php://temp));
+
+echo \nmemory stream (close after):\n;
+fclose(do_stuff(php://memory));
+
+echo \nDone.\n;
+--EXPECT--
+temp stream (close after):
+About to rewind!
+* About to connect() to 127.0.0.1 port 37349 (#0)
+* Trying 127.0.0.1... * Connection refused
+* couldn't connect to host
+* Closing connection #0
+
+memory stream (close after):
+About to rewind!
+* About to connect() to 127.0.0.1 port 37349 (#0)
+* Trying 127.0.0.1... * Connection refused
+* couldn't connect to host
+* Closing connection #0
+
+Done.
Modified: php/php-src/branches/PHP_5_3/main/streams/streams.c
===
--- php/php-src/branches/PHP_5_3/main/streams/streams.c 2010-11-15 17:10:32 UTC
(rev 305378)
+++
[PHP-CVS] svn: /php/php-src/trunk/ext/pcre/tests/ bug52971.phpt
felipe Mon, 15 Nov 2010 18:46:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305380
Log:
- Added missing test
Changed paths:
A php/php-src/trunk/ext/pcre/tests/bug52971.phpt
Added: php/php-src/trunk/ext/pcre/tests/bug52971.phpt
===
--- php/php-src/trunk/ext/pcre/tests/bug52971.phpt
(rev 0)
+++ php/php-src/trunk/ext/pcre/tests/bug52971.phpt 2010-11-15 18:46:59 UTC
(rev 305380)
@@ -0,0 +1,43 @@
+--TEST--
+Bug #52971 (PCRE-Meta-Characters not working with utf-8)
+--SKIPIF--
+?php if ((double)PCRE_VERSION 8.1) die('skip PCRE_VERSION = 8.1 is
required!'); ?
+--FILE--
+?php
+
+$message = 'Der ist ein Süßwasserpool Süsswasserpool ... verschiedene
Wassersportmöglichkeiten bei ...';
+
+$pattern = '/\bwasser/iu';
+preg_match_all($pattern, $message, $match, PREG_OFFSET_CAPTURE);
+var_dump($match);
+
+$pattern = '/[^\w]wasser/iu';
+preg_match_all($pattern, $message, $match, PREG_OFFSET_CAPTURE);
+var_dump($match);
+
+?
+--EXPECTF--
+array(1) {
+ [0]=
+ array(1) {
+[0]=
+array(2) {
+ [0]=
+ string(6) Wasser
+ [1]=
+ int(61)
+}
+ }
+}
+array(1) {
+ [0]=
+ array(1) {
+[0]=
+array(2) {
+ [0]=
+ string(7) Wasser
+ [1]=
+ int(60)
+}
+ }
+}
Property changes on: php/php-src/trunk/ext/pcre/tests/bug52971.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo/pdo_stmt.c trunk/ext/pdo/pdo_stmt.c
felipe Mon, 15 Nov 2010 18:48:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305381
Log:
- Fix wrong argument to read_property call
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c
U php/php-src/trunk/ext/pdo/pdo_stmt.c
Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c 2010-11-15 18:46:59 UTC
(rev 305380)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c 2010-11-15 18:48:48 UTC
(rev 305381)
@@ -2621,7 +2621,7 @@
}
if (strcmp(Z_STRVAL_P(member), queryString) == 0) {
zval_ptr_dtor(return_value);
- return
std_object_handlers.read_property(object, member, IS_STRING TSRMLS_CC);
+ return
std_object_handlers.read_property(object, member, type TSRMLS_CC);
}
}
}
Modified: php/php-src/trunk/ext/pdo/pdo_stmt.c
===
--- php/php-src/trunk/ext/pdo/pdo_stmt.c2010-11-15 18:46:59 UTC (rev
305380)
+++ php/php-src/trunk/ext/pdo/pdo_stmt.c2010-11-15 18:48:48 UTC (rev
305381)
@@ -2610,7 +2610,7 @@
}
if (strcmp(Z_STRVAL_P(member), queryString) == 0) {
zval_ptr_dtor(return_value);
- return
std_object_handlers.read_property(object, member, IS_STRING, key TSRMLS_CC);
+ return
std_object_handlers.read_property(object, member, type, key TSRMLS_CC);
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd_debug.c
pajoye Mon, 15 Nov 2010 23:46:21 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305389 Log: - fix build Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-11-15 23:26:25 UTC (rev 305388) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-11-15 23:46:21 UTC (rev 305389) @@ -497,20 +497,20 @@ min_in_calls=%5llu max_in_calls=%7llu avg_in_calls=%7llu min_total=%5llu max_total=%7llu avg_total=%7llu ,string_key - ,(unsigned long long) f_profile-calls - ,(unsigned long long) f_profile-own_underporm_calls - ,(unsigned long long) f_profile-in_calls_underporm_calls - ,(unsigned long long) f_profile-total_underporm_calls + ,(uint64_t) f_profile-calls + ,(uint64_t) f_profile-own_underporm_calls + ,(uint64_t) f_profile-in_calls_underporm_calls + ,(uint64_t) f_profile-total_underporm_calls - ,(unsigned long long) f_profile-min_own - ,(unsigned long long) f_profile-max_own - ,(unsigned long long) f_profile-avg_own - ,(unsigned long long) f_profile-min_in_calls - ,(unsigned long long) f_profile-max_in_calls - ,(unsigned long long) f_profile-avg_in_calls - ,(unsigned long long) f_profile-min_total - ,(unsigned long long) f_profile-max_total - ,(unsigned long long) f_profile-avg_total + ,(uint64_t) f_profile-min_own + ,(uint64_t) f_profile-max_own + ,(uint64_t) f_profile-avg_own + ,(uint64_t) f_profile-min_in_calls + ,(uint64_t) f_profile-max_in_calls + ,(uint64_t) f_profile-avg_in_calls + ,(uint64_t) f_profile-min_total + ,(uint64_t) f_profile-max_total + ,(uint64_t) f_profile-avg_total ); zend_hash_move_forward_ex(self-function_profiles, pos_values); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_debug.c
pajoye Mon, 15 Nov 2010 23:53:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305391 Log: -fix build Changed paths: U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c === --- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-11-15 23:46:43 UTC (rev 305390) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-11-15 23:53:13 UTC (rev 305391) @@ -497,20 +497,20 @@ min_in_calls=%5llu max_in_calls=%7llu avg_in_calls=%7llu min_total=%5llu max_total=%7llu avg_total=%7llu ,string_key - ,(unsigned long long) f_profile-calls - ,(unsigned long long) f_profile-own_underporm_calls - ,(unsigned long long) f_profile-in_calls_underporm_calls - ,(unsigned long long) f_profile-total_underporm_calls + ,(uint64_t) f_profile-calls + ,(uint64_t) f_profile-own_underporm_calls + ,(uint64_t) f_profile-in_calls_underporm_calls + ,(uint64_t) f_profile-total_underporm_calls - ,(unsigned long long) f_profile-min_own - ,(unsigned long long) f_profile-max_own - ,(unsigned long long) f_profile-avg_own - ,(unsigned long long) f_profile-min_in_calls - ,(unsigned long long) f_profile-max_in_calls - ,(unsigned long long) f_profile-avg_in_calls - ,(unsigned long long) f_profile-min_total - ,(unsigned long long) f_profile-max_total - ,(unsigned long long) f_profile-avg_total + ,(uint64_t) f_profile-min_own + ,(uint64_t) f_profile-max_own + ,(uint64_t) f_profile-avg_own + ,(uint64_t) f_profile-min_in_calls + ,(uint64_t) f_profile-max_in_calls + ,(uint64_t) f_profile-avg_in_calls + ,(uint64_t) f_profile-min_total + ,(uint64_t) f_profile-max_total + ,(uint64_t) f_profile-avg_total ); zend_hash_move_forward_ex(self-function_profiles, pos_values); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
