Merge branch 'pull-request/1106' into PHP-5.5

* pull-request/1106:
  Fix #67626

diff --cc NEWS
index 879ff28030db1a06ebc17e2098ca37f1a42141bc,a0900f0d04f85bad946e8e77e9d258c185ddc5e1..f0ab641d258b0602984adcdc690c8728c4fac9d1
--- 1/NEWS
--- 2/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 ec223534ff139f46a3e3ff140847284101106f2a,573b46f5db2fc1d3f2ed5cf80c74fe24991aa514..1732a99e12b876cc1807dec01ed487803ab52627
--- 1/main/streams/userspace.c
--- 2/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);
  
 -              return -1;
+       zval_ptr_dtor(&zcount);
+ 
+       if (EG(exception)) {
++              return 0;
+       }
+ 
        if (call_result == SUCCESS && retval != NULL) {
                convert_to_string(retval);
                didread = Z_STRLEN_P(retval);