]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 314b8ec efb86ae)
Merge branch 'PHP-7.1' into PHP-7.2
authorChristoph M. Becker <cmbecker69@gmx.de>
Sun, 26 Aug 2018 11:20:22 +0000 (13:20 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Sun, 26 Aug 2018 11:21:22 +0000 (13:21 +0200)
* PHP-7.1:
  Fix #68180: iconv_mime_decode can return extra characters in a header

1  2 
NEWS patch | diff1 | diff2 | blob | history
ext/iconv/iconv.c patch | diff1 | diff2 | blob | history

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