diff options
| author | Christopher Jones <sixd@php.net> | 2013-06-25 17:28:11 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-06-25 17:28:11 -0700 |
| commit | 111b385afe40674a08d5ab76f659a1e236f0da60 (patch) | |
| tree | f3cb43a2315a3d22579d76b1514cf87882ef1384 /ext/mysql/php_mysql.c | |
| parent | 5d0094e5f9f8bd49c615f2ec2542384f802d340d (diff) | |
| parent | a689fde2bf77d950901edb6be28dcfa9a8ff0b9c (diff) | |
| download | php-git-111b385afe40674a08d5ab76f659a1e236f0da60.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.4' of https://git.php.net/repository/php-src:
- BFN
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions