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)
commitadb116dd485752cc765b8018907d9040b212becf
tree9f6ce7b14d084bfa99f3931b1fe1e4d172d706b2
parentd01ca1342c2487d6f825997eeac8aeddac4cf384
parent41b73e4cee9ce68b8b78a00eddd4322b0d48dd06
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN
ext/standard/info.c