]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Thu, 3 Apr 2014 07:08:35 +0000 (09:08 +0200)
committerMichael Wallner <mike@php.net>
Thu, 3 Apr 2014 07:08:35 +0000 (09:08 +0200)
* PHP-5.4:
  Fix bug #66182  exit in stream filter produces segfault

1  2 
ext/standard/user_filters.c

Simple merge