]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Mon, 7 May 2012 19:10:36 +0000 (12:10 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 7 May 2012 19:10:36 +0000 (12:10 -0700)
* PHP-5.3:
  improve fix for CVE-2012-1823
  Fix for CVE-2012-1823

1  2 
sapi/cgi/cgi_main.c

Simple merge