]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ff259e f4707ed)
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 08:44:44 +0000 (10:44 +0200)
committerAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 08:44:44 +0000 (10:44 +0200)
* PHP-5.6:
  updated NEWS
  updated NEWS
  fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
  made failing test more meaningful
  added failing test

1  2 
Zend/zend_ini_scanner.l patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_ini_scanner.l
Simple merge
Unnamed repository; edit this file 'description' to name the repository.