]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69e0e03 8684fb7)
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Mon, 2 Apr 2012 15:36:50 +0000 (17:36 +0200)
committerAnatoliy Belsky <ab@php.net>
Mon, 2 Apr 2012 15:36:50 +0000 (17:36 +0200)
* 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

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

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