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

* pull-request/1104:
  Fix #63486

diff --cc NEWS
index f0ab641d258b0602984adcdc690c8728c4fac9d1,c2243451853b1a8866141d215b5ce3e2e798d142..b0af1ae8584a52d5f01fa972ced298eefe91961c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,21 -1,8 +1,25 @@@
  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)
 +
++- Mysqli:
++  . Fixed bug#63486 (mysqli_free_result leave the resource variable in a messy
++    state). (Julian) 
++
 +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