]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb326bb aefc8f2)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Sun, 13 Apr 2014 00:50:03 +0000 (02:50 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sun, 13 Apr 2014 00:50:03 +0000 (02:50 +0200)
* PHP-5.6:
  Fix bug #66568: the second arg for unserialize is optional.

1  2 
ext/standard/basic_functions.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/basic_functions.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.