]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Wed, 23 Mar 2016 08:16:47 +0000 (16:16 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 23 Mar 2016 08:16:47 +0000 (16:16 +0800)
* PHP-7.0:
  Fixed Bug #71884 (Null pointer deref (segfault) in stream_context_get_default)


Trivial merge