]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Mon, 19 Aug 2013 22:08:55 +0000 (00:08 +0200)
committerMichael Wallner <mike@php.net>
Mon, 19 Aug 2013 22:08:55 +0000 (00:08 +0200)
commit9d2cdacf4a36045120aab049b03229bf0064df4e
tree0003c8c1dbd05a4ca04bbd5cf0a13a512b0bf1d4
parent69f12ad582c102c1d7b3b2c0ae6cf7cd633dfe1d
parent1ac4d8f2c632f5be5a02d49c1e0d3b1fb515e4a8
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #65481 (shutdown segfault due to serialize)

Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.c