[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/fileinfo/fileinfo.c

[Felipe Pena]

Commit:b26749b4e92cd7f6dd7e4078a933758fad6647d3
Author:Felipe Pena felipe...@gmail.com Sat, 28 Jul 2012 19:05:46 
-0300
Parents:   b7d76b41e02198d6ca7651cf5bb67cf3cadae877 
068fc008c6828c2e045064a831ecb90136c6365b
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b26749b4e92cd7f6dd7e4078a933758fad6647d3

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky 
at columbia dot edu

Bugs:
https://bugs.php.net/57933

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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/fileinfo/fileinfo.c

[Anatoliy Belsky]

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