diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-06-09 15:31:27 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-06-09 15:31:27 -0700 |
| commit | 4e2fb470929ab13101c945e76e2ac397a730ba5a (patch) | |
| tree | c57b6929754e3db437b4b2d904c084e097a8a772 /sapi/activescript/php5activescript.h | |
| parent | 5f7c1917e3ab7ef7120dba6b2a3c46601781ea22 (diff) | |
| parent | 80367584910885baa1a2a4476a4a31efdcf0c9c0 (diff) | |
| download | php-git-4e2fb470929ab13101c945e76e2ac397a730ba5a.tar.gz | |
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
Diffstat (limited to 'sapi/activescript/php5activescript.h')
0 files changed, 0 insertions, 0 deletions