]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorDavid Soria Parra <dsp@php.net>
Sat, 5 May 2012 15:37:35 +0000 (17:37 +0200)
committerDavid Soria Parra <dsp@php.net>
Sat, 5 May 2012 15:37:35 +0000 (17:37 +0200)
By Rasmus Lerdorf
* PHP-5.4:
  Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9dab068d477b241d8fd872e3a7c829b3)
  Fix for CVE-2012-1823

1  2 
sapi/cgi/cgi_main.c

Simple merge