]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cc1b00 f0d1cca)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Mon, 20 Jun 2016 19:41:36 +0000 (22:41 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 20 Jun 2016 19:41:36 +0000 (22:41 +0300)
* 'master' of git.php.net:php-src:
  Use empty keys instead of _empty_ in json decoding
  update NEWS
  Fix bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.