Aaron Piotrowski 110e0a5a2c Merge branch 'master' into throwable-interface ...

# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt

2015-06-14 18:53:11 -05:00

..

libmagic

Partial revert of 1a7798c786 that introduced wrong memory access

2015-04-14 15:35:33 +03:00

tests

Updated tests to reflect exception class changes.

2015-05-16 16:49:14 -05:00

config.m4

Merge branch 'PHP-5.5' into PHP-5.6

2015-01-04 09:42:46 +01:00

config.w32

Forgot this one in the last commit, removes old VC support from ext/fileinfo

2015-03-29 07:54:18 +02:00

create_data_file.php

This commit was manufactured by cvs2svn to create branch 'PHP_5_3'.

2008-07-25 02:44:58 +00:00

CREDITS

- fix the build for win (vc6 or vc9)

2009-03-16 15:03:06 +00:00

data_file.c

after merge fix

2015-03-08 19:56:31 +01:00

EXPERIMENTAL

…

fileinfo.c

further cleanups with S_IF* macros generalized declarations

2015-05-25 18:03:28 +02:00

fileinfo.php

typo fixes - https://github.com/vlajos/misspell_fixer

2014-11-23 14:52:47 -08:00

libmagic.patch

updated libmagic.patch

2015-03-29 18:22:42 +02:00

magicdata.patch

Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly

2015-01-22 11:48:11 +01:00

Makefile.frag

MFH: enable fileinfo by default

2008-07-25 09:16:22 +00:00

package.xml

…

php_fileinfo.h

bump year

2015-01-15 23:27:30 +08:00