com php-src: Merge branch 'pull-request/1106' into PHP-5.5: NEWS main/streams/userspace.c
| From: | Stanislav Malyshev | Date: | Mon, 09 Mar 2015 05:52:21 +0000 |
| Subject: | com php-src: Merge branch 'pull-request/1106' into PHP-5.5: NEWS main/streams/userspace.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85376@lists.php.net to get a copy of this message | ||
Commit: 43b426fbc4ff6f6274ae579bead669767fe08376
Author: Stanislav Malyshev <stas@php.net> Sun, 8 Mar 2015 22:45:47 -0700
Parents: a2a20d29a85c311ba1ecf44aaa2468ca477b3b48 c4c3dca302df627c492e6ce885b777f21dce9f78
Branches: PHP-5.5 PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43b426fbc4ff6f6274ae579bead669767fe08376
Log:
Merge branch 'pull-request/1106' into PHP-5.5
* pull-request/1106:
Fix #67626
Bugs:
https://bugs.php.net/67626
Changed paths:
MM NEWS
MM main/streams/userspace.c
Diff:
diff --cc NEWS
index 879ff28,a0900f0..f0ab641
--- a/NEWS
+++ b/NEWS
@@@ -1,19 -1,8 +1,21 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015, PHP 5.5.23
+?? ??? 2015, PHP 5.5.24
- Core:
++ . Fixed bug #67626 (User exceptions not properly handled in streams).
++ (Julian)
+ . Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
+
+19 Mar 2015, PHP 5.5.23
+
+- Core:
+ . Fixed bug #69174 (leaks when unused inner class use traits precedence).
+ (Laruence)
+ . Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize).
+ (Laruence)
+ . Fixed bug #69121 (Segfault in get_current_user when script owner is not
+ in passwd with ZTS build). (dan at syneto dot net)
. Fixed bug #65593 (Segfault when calling ob_start from output buffering
callback). (Mike)
. Fixed bug #69017 (Fail to push to the empty array with the constant value
diff --cc main/streams/userspace.c
index ec22353,573b46f..1732a99
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@@ -692,6 -697,12 +697,12 @@@ static size_t php_userstreamop_read(php
1, args,
0, NULL TSRMLS_CC);
+ zval_ptr_dtor(&zcount);
+
+ if (EG(exception)) {
- return -1;
++ return 0;
+ }
+
if (call_result == SUCCESS && retval != NULL) {
convert_to_string(retval);
didread = Z_STRLEN_P(retval);