]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d01ca13 41b73e4)
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Tue, 25 Jun 2013 21:00:42 +0000 (18:00 -0300)
committerFelipe Pena <felipensp@gmail.com>
Tue, 25 Jun 2013 21:00:42 +0000 (18:00 -0300)
* PHP-5.4:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN

1  2 
ext/standard/info.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/info.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.