Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS Zend/zend_compile.c Zend/zend_globals.h Zend/zend_multibyte.c Zend/zend_multibyte.h ext/exif/exif.c ext/mbstring/mbstring.c ext/standard/html.c main/rfc1867
Hi Moriyoshi, Ops, sorry. I didn't understand your disagreement, and I didn't see any other objections. So I committed the patch as it was planned. Could you prepare a patch on top of this one? I'm also going to look into your recommendation of moving mbstring.script_encoding into zend.script_encoding instead of zend.multibyte. Thanks. Dmitry. On 12/09/2010 09:02 AM, Moriyoshi Koizumi wrote: Please revert. On Thu, Dec 9, 2010 at 3:00 PM, Moriyoshi Koizumim...@mozo.jp wrote: Hey, I don't think there was agreement on this yet. I've actually been preparing a patch that minimizes the extra hook points in SAPI. Moriyoshi On Wed, Dec 8, 2010 at 8:27 PM, Dmitry Stogovdmi...@php.net wrote: dmitry Wed, 08 Dec 2010 11:27:34 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306077 Log: Removed compile time dependency from ext/mbstring Changed paths: U php/php-src/trunk/NEWS U php/php-src/trunk/Zend/zend_compile.c U php/php-src/trunk/Zend/zend_globals.h U php/php-src/trunk/Zend/zend_multibyte.c U php/php-src/trunk/Zend/zend_multibyte.h U php/php-src/trunk/ext/exif/exif.c U php/php-src/trunk/ext/mbstring/mbstring.c U php/php-src/trunk/ext/standard/html.c U php/php-src/trunk/main/rfc1867.c U php/php-src/trunk/main/rfc1867.h A php/php-src/trunk/tests/basic/028.phpt A php/php-src/trunk/tests/basic/029.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/tests/bug42364.phpt trunk/ext/spl/tests/bug42364.phpt
eyaltThu, 09 Dec 2010 12:39:21 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306121 Log: test bug42364 included a superfluous ? Bug: http://bugs.php.net/42364 (Closed) Crash when using getRealPath with DirectoryIterator Changed paths: U php/php-src/branches/PHP_5_3/ext/spl/tests/bug42364.phpt U php/php-src/trunk/ext/spl/tests/bug42364.phpt Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/bug42364.phpt === --- php/php-src/branches/PHP_5_3/ext/spl/tests/bug42364.phpt2010-12-09 12:04:18 UTC (rev 306120) +++ php/php-src/branches/PHP_5_3/ext/spl/tests/bug42364.phpt2010-12-09 12:39:21 UTC (rev 306121) @@ -19,7 +19,6 @@ } ? ===DONE=== -? --EXPECTF-- Found %i entries! ===DONE=== Modified: php/php-src/trunk/ext/spl/tests/bug42364.phpt === --- php/php-src/trunk/ext/spl/tests/bug42364.phpt 2010-12-09 12:04:18 UTC (rev 306120) +++ php/php-src/trunk/ext/spl/tests/bug42364.phpt 2010-12-09 12:39:21 UTC (rev 306121) @@ -19,7 +19,6 @@ } ? ===DONE=== -? --EXPECTF-- Found %i entries! ===DONE=== -- 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/tests/bug53511.phpt Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/spl/tests/iterator_041b.phpt
dmitry Thu, 09 Dec 2010 16:38:37 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306135
Log:
Fixed bug #53511 (Exceptions are lost in case an exception is thrown in catch
operator)
Bug: http://bugs.php.net/53511 (Assigned) Exceptions are lost in case an
exception is thrown in catch operator
Changed paths:
A php/php-src/trunk/Zend/tests/bug53511.phpt
U php/php-src/trunk/Zend/zend_vm_def.h
U php/php-src/trunk/Zend/zend_vm_execute.h
U php/php-src/trunk/ext/spl/tests/iterator_041b.phpt
Added: php/php-src/trunk/Zend/tests/bug53511.phpt
===
--- php/php-src/trunk/Zend/tests/bug53511.phpt (rev 0)
+++ php/php-src/trunk/Zend/tests/bug53511.phpt 2010-12-09 16:38:37 UTC (rev
306135)
@@ -0,0 +1,33 @@
+--TEST--
+Bug #53511 (Exceptions are lost in case an exception is thrown in catch
operator)
+--FILE--
+?php
+class Foo {
+ function __destruct() {
+ throw new Exception(ops 1);
+ }
+}
+
+function test() {
+ $e = new Foo();
+ try {
+ throw new Exception(ops 2);
+ } catch (Exception $e) {
+ echo $e-getMessage().\n;
+ }
+}
+
+test();
+echo bug\n;
+--EXPECTF--
+Fatal error: Uncaught exception 'Exception' with message 'ops 2' in
%sbug53511.php:11
+Stack trace:
+#0 %sbug53511.php(17): test()
+#1 {main}
+
+Next exception 'Exception' with message 'ops 1' in %sbug53511.php:4
+Stack trace:
+#0 %sbug53511.php(12): Foo-__destruct()
+#1 %sbug53511.php(17): test()
+#2 {main}
+ thrown in %sbug53511.php on line 4
Modified: php/php-src/trunk/Zend/zend_vm_def.h
===
--- php/php-src/trunk/Zend/zend_vm_def.h2010-12-09 16:33:45 UTC (rev
306134)
+++ php/php-src/trunk/Zend/zend_vm_def.h2010-12-09 16:38:37 UTC (rev
306135)
@@ -2918,7 +2918,7 @@
EG(exception), sizeof(zval *),
(void**)EX_CV(opline-op2.var));
}
if (UNEXPECTED(EG(exception) != exception)) {
- EG(exception) = NULL;
+ Z_ADDREF_P(EG(exception));
HANDLE_EXCEPTION();
} else {
EG(exception) = NULL;
Modified: php/php-src/trunk/Zend/zend_vm_execute.h
===
--- php/php-src/trunk/Zend/zend_vm_execute.h2010-12-09 16:33:45 UTC (rev
306134)
+++ php/php-src/trunk/Zend/zend_vm_execute.h2010-12-09 16:38:37 UTC (rev
306135)
@@ -5843,7 +5843,7 @@
EG(exception), sizeof(zval *),
(void**)EX_CV(opline-op2.var));
}
if (UNEXPECTED(EG(exception) != exception)) {
- EG(exception) = NULL;
+ Z_ADDREF_P(EG(exception));
HANDLE_EXCEPTION();
} else {
EG(exception) = NULL;
Modified: php/php-src/trunk/ext/spl/tests/iterator_041b.phpt
===
--- php/php-src/trunk/ext/spl/tests/iterator_041b.phpt 2010-12-09 16:33:45 UTC
(rev 306134)
+++ php/php-src/trunk/ext/spl/tests/iterator_041b.phpt 2010-12-09 16:38:37 UTC
(rev 306135)
@@ -82,6 +82,10 @@
{
self::$fail++;
}
+ try {
+ $e = null;
+ } catch (Exception $e) {
+ }
}
}
}
@@ -101,10 +105,19 @@
State 4: current()
State 5: key()
State 6: next()
+State 7: __destruct()
+array(2) {
+ [0]=
+ int(1)
+ [1]=
+ int(2)
+}
===iterator_count===
State 0: __construct()
State 1: __construct()
State 2: rewind()
State 3: valid()
State 6: next()
+State 7: __destruct()
+int(2)
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/main/ fopen_wrappers.c
pajoye Thu, 09 Dec 2010 17:04:29 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306136
Log:
- missing merge fix for #53352
Bug: http://bugs.php.net/53352 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_2/main/fopen_wrappers.c
Modified: php/php-src/branches/PHP_5_2/main/fopen_wrappers.c
===
--- php/php-src/branches/PHP_5_2/main/fopen_wrappers.c 2010-12-09 16:38:37 UTC
(rev 306135)
+++ php/php-src/branches/PHP_5_2/main/fopen_wrappers.c 2010-12-09 17:04:29 UTC
(rev 306136)
@@ -172,6 +172,9 @@
resolved_basedir[resolved_basedir_len] =
PHP_DIR_SEPARATOR;
resolved_basedir[++resolved_basedir_len] = '\0';
}
+ } else {
+ resolved_basedir[resolved_basedir_len++] =
PHP_DIR_SEPARATOR;
+ resolved_basedir[resolved_basedir_len] = '\0';
}
resolved_name_len = strlen(resolved_name);
--
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/ NEWS Zend/zend_compile.c Zend/zend_globals.h Zend/zend_multibyte.c Zend/zend_multibyte.h ext/exif/exif.c ext/mbstring/mbstring.c ext/standard/html.c main/rfc1867
I was thinking that this is rather a *big* change, so we'd better roll our patches into one and commit it altogether. I am fine if that works for anyone else. Regards, Moriyoshi On Thu, Dec 9, 2010 at 6:11 PM, Dmitry Stogov dmi...@zend.com wrote: Hi Moriyoshi, Ops, sorry. I didn't understand your disagreement, and I didn't see any other objections. So I committed the patch as it was planned. Could you prepare a patch on top of this one? I'm also going to look into your recommendation of moving mbstring.script_encoding into zend.script_encoding instead of zend.multibyte. Thanks. Dmitry. On 12/09/2010 09:02 AM, Moriyoshi Koizumi wrote: Please revert. On Thu, Dec 9, 2010 at 3:00 PM, Moriyoshi Koizumim...@mozo.jp wrote: Hey, I don't think there was agreement on this yet. I've actually been preparing a patch that minimizes the extra hook points in SAPI. Moriyoshi On Wed, Dec 8, 2010 at 8:27 PM, Dmitry Stogovdmi...@php.net wrote: dmitry Wed, 08 Dec 2010 11:27:34 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306077 Log: Removed compile time dependency from ext/mbstring Changed paths: U php/php-src/trunk/NEWS U php/php-src/trunk/Zend/zend_compile.c U php/php-src/trunk/Zend/zend_globals.h U php/php-src/trunk/Zend/zend_multibyte.c U php/php-src/trunk/Zend/zend_multibyte.h U php/php-src/trunk/ext/exif/exif.c U php/php-src/trunk/ext/mbstring/mbstring.c U php/php-src/trunk/ext/standard/html.c U php/php-src/trunk/main/rfc1867.c U php/php-src/trunk/main/rfc1867.h A php/php-src/trunk/tests/basic/028.phpt A php/php-src/trunk/tests/basic/029.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
iliaaThu, 09 Dec 2010 19:34:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306137 Log: Re-branch Changed paths: D php/php-src/tags/php_5_2_15/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaThu, 09 Dec 2010 19:35:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306138 Log: Re-branch 5.2.15 Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2010-12-09 19:34:23 UTC (rev 306137) +++ php/php-src/branches/PHP_5_2/NEWS 2010-12-09 19:35:13 UTC (rev 306138) @@ -1,7 +1,5 @@ PHP NEWS ||| -?? ?? , PHP 5.2.16 - 09 Dec 2010, PHP 5.2.15 - Fixed extract() to do not overwrite $GLOBALS and $this when using EXTR_OVERWRITE. (jorto at redhat dot com) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2010-12-09 19:34:23 UTC (rev 306137) +++ php/php-src/branches/PHP_5_2/configure.in 2010-12-09 19:35:13 UTC (rev 306138) @@ -41,8 +41,8 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=16 -PHP_EXTRA_VERSION=-dev +PHP_RELEASE_VERSION=15 +PHP_EXTRA_VERSION= 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` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2010-12-09 19:34:23 UTC (rev 306137) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-12-09 19:35:13 UTC (rev 306138) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 16 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.2.16-dev -#define PHP_VERSION_ID 50216 +#define PHP_RELEASE_VERSION 15 +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.2.15 +#define PHP_VERSION_ID 50215 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
iliaaThu, 09 Dec 2010 19:35:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306139 Log: Re-tag Changed paths: A + php/php-src/tags/php_5_2_15/ (from php/php-src/branches/PHP_5_2/:r306138) Property changes on: php/php-src/tags/php_5_2_15 ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini Added: svn:mergeinfo + /php/php-src/branches/PHP_5_3:284120,288260,288273 /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaThu, 09 Dec 2010 19:36:06 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306140 Log: back to dev Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2010-12-09 19:35:29 UTC (rev 306139) +++ php/php-src/branches/PHP_5_2/NEWS 2010-12-09 19:36:06 UTC (rev 306140) @@ -1,5 +1,7 @@ PHP NEWS ||| +?? ??? , PHP 5.2.16 + 09 Dec 2010, PHP 5.2.15 - Fixed extract() to do not overwrite $GLOBALS and $this when using EXTR_OVERWRITE. (jorto at redhat dot com) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2010-12-09 19:35:29 UTC (rev 306139) +++ php/php-src/branches/PHP_5_2/configure.in 2010-12-09 19:36:06 UTC (rev 306140) @@ -41,8 +41,8 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=15 -PHP_EXTRA_VERSION= +PHP_RELEASE_VERSION=16 +PHP_EXTRA_VERSION=-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` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2010-12-09 19:35:29 UTC (rev 306139) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-12-09 19:36:06 UTC (rev 306140) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 15 -#define PHP_EXTRA_VERSION -#define PHP_VERSION 5.2.15 -#define PHP_VERSION_ID 50215 +#define PHP_RELEASE_VERSION 16 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.2.16-dev +#define PHP_VERSION_ID 50216 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ main/SAPI.c main/main.c main/php_globals.h tests/basic/enable_post_data_reading_01.phpt tests/basic/enable_post_data_reading_02.phpt tests/basic/enable_post_data_rea
cataphract Thu, 09 Dec 2010 20:35:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306143
Log:
- Added enable_post_data_reading ini option to allow inhibiting POST data
consumption.
Changed paths:
U php/php-src/trunk/main/SAPI.c
U php/php-src/trunk/main/main.c
U php/php-src/trunk/main/php_globals.h
A php/php-src/trunk/tests/basic/enable_post_data_reading_01.phpt
A php/php-src/trunk/tests/basic/enable_post_data_reading_02.phpt
A php/php-src/trunk/tests/basic/enable_post_data_reading_03.phpt
A php/php-src/trunk/tests/basic/enable_post_data_reading_04.phpt
Modified: php/php-src/trunk/main/SAPI.c
===
--- php/php-src/trunk/main/SAPI.c 2010-12-09 20:31:38 UTC (rev 306142)
+++ php/php-src/trunk/main/SAPI.c 2010-12-09 20:35:59 UTC (rev 306143)
@@ -393,7 +393,7 @@
/* handle request mehtod */
if (SG(server_context)) {
- if ( SG(request_info).request_method) {
+ if (PG(enable_post_data_reading)
SG(request_info).request_method) {
if(!strcmp(SG(request_info).request_method, POST)
(SG(request_info).content_type)) {
/* HTTP POST - may contain form data to be
read into variables
Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c 2010-12-09 20:31:38 UTC (rev 306142)
+++ php/php-src/trunk/main/main.c 2010-12-09 20:35:59 UTC (rev 306143)
@@ -490,6 +490,7 @@
STD_PHP_INI_BOOLEAN(allow_url_fopen, 1,
PHP_INI_SYSTEM, OnUpdateBool, allow_url_fopen,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN(allow_url_include,0,
PHP_INI_SYSTEM, OnUpdateBool, allow_url_include,
php_core_globals, core_globals)
+ STD_PHP_INI_BOOLEAN(enable_post_data_reading, 1,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, enable_post_data_reading,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN(always_populate_raw_post_data,0,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, always_populate_raw_post_data,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY(realpath_cache_size,16K,
PHP_INI_SYSTEM, OnUpdateLong, realpath_cache_size_limit,
virtual_cwd_globals,cwd_globals)
Modified: php/php-src/trunk/main/php_globals.h
===
--- php/php-src/trunk/main/php_globals.h2010-12-09 20:31:38 UTC (rev
306142)
+++ php/php-src/trunk/main/php_globals.h2010-12-09 20:35:59 UTC (rev
306143)
@@ -132,6 +132,7 @@
zend_bool file_uploads;
zend_bool during_request_startup;
zend_bool allow_url_fopen;
+ zend_bool enable_post_data_reading;
zend_bool always_populate_raw_post_data;
zend_bool report_zend_debug;
Added: php/php-src/trunk/tests/basic/enable_post_data_reading_01.phpt
===
--- php/php-src/trunk/tests/basic/enable_post_data_reading_01.phpt
(rev 0)
+++ php/php-src/trunk/tests/basic/enable_post_data_reading_01.phpt
2010-12-09 20:35:59 UTC (rev 306143)
@@ -0,0 +1,22 @@
+--TEST--
+enable_post_data_reading: basic test
+--INI--
+enable_post_data_reading=0
+--POST_RAW--
+Content-Type: application/x-www-form-urlencoded
+a=1b=ZYX
+--FILE--
+?php
+var_dump($_FILES);
+var_dump($_POST);
+var_dump($HTTP_RAW_POST_DATA);
+var_dump(file_get_contents(php://input));
+--EXPECTF--
+array(0) {
+}
+array(0) {
+}
+
+Notice: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d
+NULL
+string(9) a=1b=ZYX
Property changes on:
php/php-src/trunk/tests/basic/enable_post_data_reading_01.phpt
___
Added: svn:keywords
+ Id Rev Revision Date LastChangedDate LastChangedRevision Author
LastChangedBy HeadURL URL
Added: svn:eol-style
+ native
Added: php/php-src/trunk/tests/basic/enable_post_data_reading_02.phpt
===
--- php/php-src/trunk/tests/basic/enable_post_data_reading_02.phpt
(rev 0)
+++ php/php-src/trunk/tests/basic/enable_post_data_reading_02.phpt
2010-12-09 20:35:59 UTC (rev 306143)
@@ -0,0 +1,28 @@
+--TEST--
+enable_post_data_reading: rfc1867
+--INI--
+enable_post_data_reading=0
+--POST_RAW--
+Content-Type: multipart/form-data;
boundary=---20896060251896012921717172737
+-20896060251896012921717172737
+Content-Disposition: form-data; name=file1; filename=file1.txt
+Content-Type: text/plain-file
+
+1
Re: [PHP-CVS] svn: /php/php-src/trunk/ main/SAPI.c main/main.c main/php_globals.h tests/basic/enable_post_data_reading_01.phpt tests/basic/enable_post_data_reading_02.phpt tests/basic/enable_post_data
On 12/09/2010 12:35 PM, Gustavo André dos Santos Lopes wrote: cataphract Thu, 09 Dec 2010 20:35:59 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306143 Log: - Added enable_post_data_reading ini option to allow inhibiting POST data consumption. Changed paths: U php/php-src/trunk/main/SAPI.c U php/php-src/trunk/main/main.c U php/php-src/trunk/main/php_globals.h A php/php-src/trunk/tests/basic/enable_post_data_reading_01.phpt A php/php-src/trunk/tests/basic/enable_post_data_reading_02.phpt A php/php-src/trunk/tests/basic/enable_post_data_reading_03.phpt A php/php-src/trunk/tests/basic/enable_post_data_reading_04.phpt Hi Gustavo, Can you update php.ini-*, NEWS, the doc etc? Thanks, Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_oci/oci_statement.c branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_strea
felipe Fri, 10 Dec 2010 00:33:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306149
Log:
- Fixed bug #39199 (Cannot load Lob data with more than 4000 bytes on ORACLE 10)
patch by: spatar at mail dot nnov dot ru
Bug: http://bugs.php.net/39199 (Open) Cannot load Lob data with more than 4000
bytes on ORACLE 10
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/pdo_oci/oci_statement.c
A php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
A php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
U php/php-src/trunk/ext/pdo_oci/oci_statement.c
A php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
A php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-12-10 00:30:23 UTC (rev 306148)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-12-10 00:33:48 UTC (rev 306149)
@@ -1,6 +1,9 @@
PHPNEWS
|||
?? ??? 20??, PHP 5.3.5
+- PDO Oracle driver:
+ . Fixed bug #39199 (Cannot load Lob data with more than 4000 bytes on
+ORACLE 10). (spatar at mail dot nnov dot ru)
09 Dec 2010, PHP 5.3.4
- Upgraded bundled Sqlite3 to version 3.7.3. (Ilia)
Modified: php/php-src/branches/PHP_5_3/ext/pdo_oci/oci_statement.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_oci/oci_statement.c 2010-12-10 00:30:23 UTC (rev 306148)
+++ php/php-src/branches/PHP_5_3/ext/pdo_oci/oci_statement.c 2010-12-10 00:33:48 UTC (rev 306149)
@@ -31,6 +31,8 @@
#include php_pdo_oci_int.h
#include Zend/zend_extensions.h
+#define PDO_OCI_LOBMAXSIZE (4294967295UL) /* OCI_LOBMAXSIZE */
+
#define STMT_CALL(name, params) \
do {\
S-last_err = name params; \
@@ -634,11 +636,14 @@
amt, self-offset, buf, count,
NULL, NULL, 0, SQLCS_IMPLICIT);
- if (r != OCI_SUCCESS) {
+ if (r != OCI_SUCCESS r != OCI_NEED_DATA) {
return (size_t)-1;
}
self-offset += amt;
+ if (amt count) {
+ stream-eof = 1;
+ }
return amt;
}
@@ -664,14 +669,17 @@
return 0;
}
-/* TODO: implement
static int oci_blob_seek(php_stream *stream, off_t offset, int whence, off_t *newoffset TSRMLS_DC)
{
struct oci_lob_self *self = (struct oci_lob_self*)stream-abstract;
- return -1;
+ if (offset = PDO_OCI_LOBMAXSIZE) {
+ return -1;
+ } else {
+ self-offset = offset + 1; /* Oracle LOBS are 1-based, but PHP is 0-based */
+ return 0;
+ }
}
-*/
static php_stream_ops oci_blob_stream_ops = {
oci_blob_write,
@@ -679,7 +687,7 @@
oci_blob_close,
oci_blob_flush,
pdo_oci blob stream,
- NULL, /*oci_blob_seek,*/
+ oci_blob_seek,
NULL,
NULL,
NULL
Added: php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt 2010-12-10 00:33:48 UTC (rev 306149)
@@ -0,0 +1,59 @@
+--TEST--
+PDO_OCI: check fread() EOF
+--SKIPIF--
+?php
+if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded');
+require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+PDOTest::skip();
+?
+--FILE--
+?php
+
+require(dirname(__FILE__) . '/../../pdo/tests/pdo_test.inc');
+
+$dbh = PDOTest::factory();
+
+$dbh-setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
+
+// Initialization
+$stmtarray = array(
+begin execute immediate 'drop table pdo_oci_fread_tab'; exception when others then null; end;,
+ create table pdo_oci_fread_tab (id number, data clob),
+declare
+lob1 clob := 'abc' || lpad('j',4020,'j') || 'xyz';
+ begin
+insert into pdo_oci_fread_tab (id,data) values (1, lob1);
+ end;
+);
+
+foreach ($stmtarray as $stmt) {
+ $dbh-exec($stmt);
+}
+
+echo Test 1\n;
+
+$s = $dbh-query(select data from pdo_oci_fread_tab where id = 1);
+$r = $s-fetch();
+$sh = $r['data'];
+
+while (!feof($sh)) {
+$buffer = fread($sh,1024);
+echo '*'.$buffer.'*';
+}
+echo \n;
+fclose($sh);
+
+// Clean up
+
+$stmtarray = array(
+ drop table pdo_oci_fread_tab
+);
+
+foreach ($stmtarray as $stmt) {
+ $dbh-exec($stmt);
+}
+
+?
+--EXPECTF--
+Test 1
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/intl/formatter/formatter_attr.c trunk/ext/intl/formatter/formatter_attr.c
felipe Fri, 10 Dec 2010 00:47:51 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306154
Log:
- Fixed bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values)
Bug: http://bugs.php.net/53512 (Open) NumberFormatter::setSymbol crash on bogus
$attr values
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/intl/formatter/formatter_attr.c
U php/php-src/trunk/ext/intl/formatter/formatter_attr.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-12-10 00:37:31 UTC (rev 306153)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-12-10 00:47:51 UTC (rev 306154)
@@ -1,6 +1,10 @@
PHP
NEWS
|||
?? ??? 20??, PHP 5.3.5
+- Intl extension:
+ . Fixed bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values).
+(Felipe)
+
- PDO Oracle driver:
. Fixed bug #39199 (Cannot load Lob data with more than 4000 bytes on
ORACLE 10). (spatar at mail dot nnov dot ru)
Modified: php/php-src/branches/PHP_5_3/ext/intl/formatter/formatter_attr.c
===
--- php/php-src/branches/PHP_5_3/ext/intl/formatter/formatter_attr.c
2010-12-10 00:37:31 UTC (rev 306153)
+++ php/php-src/branches/PHP_5_3/ext/intl/formatter/formatter_attr.c
2010-12-10 00:47:51 UTC (rev 306154)
@@ -311,6 +311,11 @@
RETURN_FALSE;
}
+
+ if (symbol = UNUM_FORMAT_SYMBOL_COUNT || symbol 0) {
+ intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
numfmt_set_symbol: invalid symbol value, 0 TSRMLS_CC );
+ RETURN_FALSE;
+ }
/* Fetch the object. */
FORMATTER_METHOD_FETCH_OBJECT;
Modified: php/php-src/trunk/ext/intl/formatter/formatter_attr.c
===
--- php/php-src/trunk/ext/intl/formatter/formatter_attr.c 2010-12-10
00:37:31 UTC (rev 306153)
+++ php/php-src/trunk/ext/intl/formatter/formatter_attr.c 2010-12-10
00:47:51 UTC (rev 306154)
@@ -311,6 +311,11 @@
RETURN_FALSE;
}
+
+ if (symbol = UNUM_FORMAT_SYMBOL_COUNT || symbol 0) {
+ intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
numfmt_set_symbol: invalid symbol value, 0 TSRMLS_CC );
+ RETURN_FALSE;
+ }
/* Fetch the object. */
FORMATTER_METHOD_FETCH_OBJECT;
--
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/intl/tests/bug53512.phpt trunk/ext/intl/tests/bug53512.phpt
felipe Fri, 10 Dec 2010 00:59:50 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306157
Log:
- Added test for bug #53512
Bug: http://bugs.php.net/53512 (Closed) NumberFormatter::setSymbol crash on
bogus $attr values
Changed paths:
A php/php-src/branches/PHP_5_3/ext/intl/tests/bug53512.phpt
A php/php-src/trunk/ext/intl/tests/bug53512.phpt
Added: php/php-src/branches/PHP_5_3/ext/intl/tests/bug53512.phpt
===
--- php/php-src/branches/PHP_5_3/ext/intl/tests/bug53512.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/intl/tests/bug53512.phpt 2010-12-10
00:59:50 UTC (rev 306157)
@@ -0,0 +1,25 @@
+--TEST--
+Bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values)
+--SKIPIF--
+?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?
+--FILE--
+?php
+
+$badvals = array(4294901761, 2147483648, -2147483648, -1);
+
+foreach ($badvals as $val) {
+ $x = numfmt_create(en, NumberFormatter::PATTERN_DECIMAL);
+ var_dump(numfmt_set_symbol($x, $val, ));
+ var_dump(intl_get_error_message());
+}
+
+?
+--EXPECTF--
+bool(false)
+string(65) numfmt_set_symbol: invalid symbol value: U_ILLEGAL_ARGUMENT_ERROR
+bool(false)
+string(65) numfmt_set_symbol: invalid symbol value: U_ILLEGAL_ARGUMENT_ERROR
+bool(false)
+string(65) numfmt_set_symbol: invalid symbol value: U_ILLEGAL_ARGUMENT_ERROR
+bool(false)
+string(65) numfmt_set_symbol: invalid symbol value: U_ILLEGAL_ARGUMENT_ERROR
Property changes on: php/php-src/branches/PHP_5_3/ext/intl/tests/bug53512.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/trunk/ext/intl/tests/bug53512.phpt
===
--- php/php-src/trunk/ext/intl/tests/bug53512.phpt
(rev 0)
+++ php/php-src/trunk/ext/intl/tests/bug53512.phpt 2010-12-10 00:59:50 UTC
(rev 306157)
@@ -0,0 +1,25 @@
+--TEST--
+Bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values)
+--SKIPIF--
+?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?
+--FILE--
+?php
+
+$badvals = array(4294901761, 2147483648, -2147483648, -1);
+
+foreach ($badvals as $val) {
+ $x = numfmt_create(en, NumberFormatter::PATTERN_DECIMAL);
+ var_dump(numfmt_set_symbol($x, $val, ));
+ var_dump(intl_get_error_message());
+}
+
+?
+--EXPECTF--
+bool(false)
+string(65) numfmt_set_symbol: invalid symbol value: U_ILLEGAL_ARGUMENT_ERROR
+bool(false)
+string(65) numfmt_set_symbol: invalid symbol value: U_ILLEGAL_ARGUMENT_ERROR
+bool(false)
+string(65) numfmt_set_symbol: invalid symbol value: U_ILLEGAL_ARGUMENT_ERROR
+bool(false)
+string(65) numfmt_set_symbol: invalid symbol value: U_ILLEGAL_ARGUMENT_ERROR
Property changes on: php/php-src/trunk/ext/intl/tests/bug53512.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/trunk/ext/curl/ interface.c
scottmac Fri, 10 Dec 2010 01:45:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306162
Log:
Add more constants to curl_getinfo(), dependent on cURL version installed so
wrapped in ifdefs
Changed paths:
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/trunk/ext/curl/interface.c
===
--- php/php-src/trunk/ext/curl/interface.c 2010-12-10 01:32:16 UTC (rev
306161)
+++ php/php-src/trunk/ext/curl/interface.c 2010-12-10 01:45:55 UTC (rev
306162)
@@ -2315,12 +2315,33 @@
create_certinfo(ci, listcode TSRMLS_CC);
CAAZ(certinfo, listcode);
}
+ if (curl_easy_getinfo(ch-cp, CURLINFO_PRIMARY_IP, s_code) ==
CURLE_OK) {
+ CAAS(primary_ip, s_code);
+ }
#endif
+#if LIBCURL_VERSION_NUM 0x071500
+ if (curl_easy_getinfo(ch-cp, CURLINFO_PRIMARY_PORT, l_code)
== CURLE_OK) {
+ CAAL(primary_port, l_code);
+ }
+ if (curl_easy_getinfo(ch-cp, CURLINFO_LOCAL_IP, s_code) ==
CURLE_OK) {
+ CAAS(local_ip, s_code);
+ }
+ if (curl_easy_getinfo(ch-cp, CURLINFO_LOCAL_PORT, l_code) ==
CURLE_OK) {
+ CAAL(local_port, l_code);
+ }
+#endif
if (ch-header.str_len 0) {
CAAS(request_header, ch-header.str);
}
} else {
switch (option) {
+ /* string variable types */
+#if LIBCURL_VERSION_NUM = 0x071500
+ case CURLINFO_PRIMARY_IP:
+#endif
+#if LIBCURL_VERSION_NUM = 0x071500
+ case CURLINFO_LOCAL_IP:
+#endif
case CURLINFO_PRIVATE:
case CURLINFO_EFFECTIVE_URL:
case CURLINFO_CONTENT_TYPE: {
@@ -2333,6 +2354,11 @@
}
break;
}
+ /* Long variable types */
+#if LIBCURL_VERSION_NUM = 0x071500
+ case CURLINFO_PRIMARY_PORT:
+ case CURLINFO_LOCAL_PORT:
+#endif
case CURLINFO_HTTP_CODE:
case CURLINFO_HEADER_SIZE:
case CURLINFO_REQUEST_SIZE:
@@ -2348,6 +2374,7 @@
}
break;
}
+ /* Double variable types */
case CURLINFO_TOTAL_TIME:
case CURLINFO_NAMELOOKUP_TIME:
case CURLINFO_CONNECT_TIME:
--
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/tests/pdo_025.phpt trunk/ext/pdo/tests/pdo_025.phpt
eyaltThu, 09 Dec 2010 12:04:18 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306120 Log: pdo_025 expected a certain extra character that is not part of windows output. changed to optional char: %a - %A Changed paths: U php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_025.phpt U php/php-src/trunk/ext/pdo/tests/pdo_025.phpt Modified: php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_025.phpt === --- php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_025.phpt 2010-12-09 10:57:41 UTC (rev 306119) +++ php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_025.phpt 2010-12-09 12:04:18 UTC (rev 306120) @@ -110,4 +110,4 @@ } ===FAIL=== -Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d%a \ No newline at end of file +Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d%A Modified: php/php-src/trunk/ext/pdo/tests/pdo_025.phpt === --- php/php-src/trunk/ext/pdo/tests/pdo_025.phpt2010-12-09 10:57:41 UTC (rev 306119) +++ php/php-src/trunk/ext/pdo/tests/pdo_025.phpt2010-12-09 12:04:18 UTC (rev 306120) @@ -110,4 +110,4 @@ } ===FAIL=== -Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d%a \ No newline at end of file +Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d%A -- 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/oci8/package.xml trunk/ext/oci8/package.xml
sixd Fri, 10 Dec 2010 04:36:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306166 Log: Update for PECL upload that is synced with PHP 5.3.4 Changed paths: U php/php-src/branches/PHP_5_3/ext/oci8/package.xml U php/php-src/trunk/ext/oci8/package.xml Modified: php/php-src/branches/PHP_5_3/ext/oci8/package.xml === --- php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2010-12-10 04:27:14 UTC (rev 306165) +++ php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2010-12-10 04:36:29 UTC (rev 306166) @@ -33,15 +33,15 @@ activeno/active /lead - date2010-11-16/date - time15:00:00/time + date2010-12-09/date + time20:00:00/time version release1.4.5/release api1.4.5/api /version stability - releasedevel/release + releasestable/release apistable/api /stability license uri=http://www.php.net/license;PHP/license Modified: php/php-src/trunk/ext/oci8/package.xml === --- php/php-src/trunk/ext/oci8/package.xml 2010-12-10 04:27:14 UTC (rev 306165) +++ php/php-src/trunk/ext/oci8/package.xml 2010-12-10 04:36:29 UTC (rev 306166) @@ -33,15 +33,15 @@ activeno/active /lead - date2010-11-16/date - time15:00:00/time + date2010-12-09/date + time20:00:00/time version release1.4.5/release api1.4.5/api /version stability - releasedevel/release + releasestable/release apistable/api /stability license uri=http://www.php.net/license;PHP/license -- 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/ NEWS Zend/zend_compile.c Zend/zend_globals.h Zend/zend_multibyte.c Zend/zend_multibyte.h ext/exif/exif.c ext/mbstring/mbstring.c ext/standard/html.c main/rfc1867
On 12/09/2010 08:51 PM, Moriyoshi Koizumi wrote: I was thinking that this is rather a *big* change, so we'd better roll our patches into one and commit it altogether. Sorry, that time I didn't understand that you started to improve the patch. I am fine if that works for anyone else. The patch had few small issues, but they are already fixed. Thanks. Dmitry. Regards, Moriyoshi On Thu, Dec 9, 2010 at 6:11 PM, Dmitry Stogovdmi...@zend.com wrote: Hi Moriyoshi, Ops, sorry. I didn't understand your disagreement, and I didn't see any other objections. So I committed the patch as it was planned. Could you prepare a patch on top of this one? I'm also going to look into your recommendation of moving mbstring.script_encoding into zend.script_encoding instead of zend.multibyte. Thanks. Dmitry. On 12/09/2010 09:02 AM, Moriyoshi Koizumi wrote: Please revert. On Thu, Dec 9, 2010 at 3:00 PM, Moriyoshi Koizumim...@mozo.jpwrote: Hey, I don't think there was agreement on this yet. I've actually been preparing a patch that minimizes the extra hook points in SAPI. Moriyoshi On Wed, Dec 8, 2010 at 8:27 PM, Dmitry Stogovdmi...@php.netwrote: dmitry Wed, 08 Dec 2010 11:27:34 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306077 Log: Removed compile time dependency from ext/mbstring Changed paths: U php/php-src/trunk/NEWS U php/php-src/trunk/Zend/zend_compile.c U php/php-src/trunk/Zend/zend_globals.h U php/php-src/trunk/Zend/zend_multibyte.c U php/php-src/trunk/Zend/zend_multibyte.h U php/php-src/trunk/ext/exif/exif.c U php/php-src/trunk/ext/mbstring/mbstring.c U php/php-src/trunk/ext/standard/html.c U php/php-src/trunk/main/rfc1867.c U php/php-src/trunk/main/rfc1867.h A php/php-src/trunk/tests/basic/028.phpt A php/php-src/trunk/tests/basic/029.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS Zend/tests/indirect_reference_this.phpt Zend/zend_compile.c
scottmac Fri, 10 Dec 2010 06:34:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306169
Log:
MFH: Fix indirect reference of $this
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
A php/php-src/branches/PHP_5_3/Zend/tests/indirect_reference_this.phpt
U php/php-src/branches/PHP_5_3/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-12-10 05:16:47 UTC (rev 306168)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-12-10 06:34:03 UTC (rev 306169)
@@ -8,6 +8,9 @@
- PDO Oracle driver:
. Fixed bug #39199 (Cannot load Lob data with more than 4000 bytes on
ORACLE 10). (spatar at mail dot nnov dot ru)
+
+- Indirect reference to $this fails to resolve if direct $this is never used
+ in method. (Scott)
09 Dec 2010, PHP 5.3.4
- Upgraded bundled Sqlite3 to version 3.7.3. (Ilia)
Added: php/php-src/branches/PHP_5_3/Zend/tests/indirect_reference_this.phpt
===
--- php/php-src/branches/PHP_5_3/Zend/tests/indirect_reference_this.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/Zend/tests/indirect_reference_this.phpt
2010-12-10 06:34:03 UTC (rev 306169)
@@ -0,0 +1,13 @@
+--TEST--
+Indirect referenced $this
+--FILE--
+?php
+class X {
+ function f($x){var_dump($$x);}
+}
+$x = new X;
+$x-f(this);
+?
+--EXPECTF--
+object(X)#%d (0) {
+}
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_3/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_compile.c2010-12-10 05:16:47 UTC
(rev 306168)
+++ php/php-src/branches/PHP_5_3/Zend/zend_compile.c2010-12-10 06:34:03 UTC
(rev 306169)
@@ -4351,6 +4351,10 @@
}
zend_do_begin_variable_parse(TSRMLS_C);
fetch_simple_variable(result, variable, 1 TSRMLS_CC);
+ /* there is a chance someone is accessing $this */
+ if (CG(active_op_array)-scope CG(active_op_array)-this_var == -1) {
+ CG(active_op_array)-this_var = lookup_cv(CG(active_op_array),
estrndup(this, sizeof(this)-1), sizeof(this)-1 TSRMLS_CC);
+ }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
