]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Sat, 15 Aug 2015 08:29:12 +0000 (16:29 +0800)
committerTjerk Meesters <datibbaw@php.net>
Sat, 15 Aug 2015 08:49:30 +0000 (16:49 +0800)
commit0bd7d7a3691cee4e916d1008500cf21b80e03056
tree3060ccc058447c56c4e42dfbefad42e2a4311552
parentc63b50557318132723494d945ae284f517ab2e16
parentb0c5439b5f1874070b1baae2dd4c70530b724da1
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS for #70157
  Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
Zend/zend_ini_parser.y
ext/standard/basic_functions.c