]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c9b62f 4b5cdda)
Merge branch 'PHP-7.2' into PHP-7.3
authorStanislav Malyshev <stas@php.net>
Mon, 21 Oct 2019 20:17:19 +0000 (13:17 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 21 Oct 2019 20:17:19 +0000 (13:17 -0700)
* PHP-7.2:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release

1  2 
sapi/fpm/fpm/fpm_main.c patch | diff1 | diff2 | blob | history
sapi/fpm/tests/tester.inc patch | diff1 | diff2 | blob | history

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge
diff --cc sapi/fpm/tests/tester.inc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.