Commit: 374646c36b07956da928e0583854002e55b4013e Author: Anatoliy Belsky <a...@php.net> Mon, 2 Apr 2012 17:36:50 +0200 Parents: 69e0e034577dedcb549c4fb5bd304f1a14d842d2 8684fb7facd8f5c1589996c1ebfd782f77c245ff Branches: PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=374646c36b07956da928e0583854002e55b4013e Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: updated the libmagic.patch Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails - update to openssl 0.9.8u Conflicts: ext/fileinfo/tests/finfo_open_001.phpt ext/fileinfo/tests/finfo_open_error.phpt win32/build/libs_version.txt Bugs: https://bugs.php.net/61566 https://bugs.php.net/61565 Changed paths: MM ext/fileinfo/fileinfo.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
