]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0556103 168e892)
Merge branch 'PHP-5.3' into PHP-5.4
authorDavid Soria Parra <dsp@php.net>
Sat, 5 May 2012 15:36:55 +0000 (17:36 +0200)
committerDavid Soria Parra <dsp@php.net>
Sat, 5 May 2012 15:36:55 +0000 (17:36 +0200)
By Rasmus Lerdorf
* PHP-5.3:
  Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9dab068d477b241d8fd872e3a7c829b3)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.