]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 563462f 60a2742)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Wed, 10 Jun 2015 04:39:59 +0000 (21:39 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 10 Jun 2015 04:39:59 +0000 (21:39 -0700)
commitd4407e1cb9865b544fcf1d4a2adf2df759730425
tree2c97ea58800a9de6501ee8f7ff7bacd6dfec02a1tree | snapshot
parent563462fbf8c45c5fe54c6b215d6ec76b5b3f867ccommit | diff
parent60a2742fd280ea4a53e6f4c2f811bedbec89393dcommit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  add NEWS
  Fixed bug #68776
  fix test
  update NEWS
  Fix bug #69646 OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

Conflicts:
ext/dom/document.c
ext/gd/gd.c
ext/standard/exec.c
ext/dom/document.c diff1 | diff2 | blob | history
ext/standard/mail.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.