]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 9 Jun 2015 22:31:27 +0000 (15:31 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 9 Jun 2015 22:31:27 +0000 (15:31 -0700)
commit4e2fb470929ab13101c945e76e2ac397a730ba5a
treec57b6929754e3db437b4b2d904c084e097a8a772
parent5f7c1917e3ab7ef7120dba6b2a3c46601781ea22
parent80367584910885baa1a2a4476a4a31efdcf0c9c0
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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/dom/document.c
ext/gd/gd.c
ext/standard/exec.c