Dmitry Stogov 9dd66e4d53 Merge branch 'master' into phpng ... * master: Fixed issue #183 (TMP_VAR is not only used once) Fix broken Junit output with --disable-cgi Added folder mark Further test fixes for the fdb2709 breakage. Fix broken test caused by fdb2709. Added tests for ZipArchive::addGlob() and ZipArchive::addPattern() Fix run-tests.php with Valgrind >= 3.10.0. Add microseconds to the serialised form of DateTime objects. Improved test for bug #62479 fix typo in ODBC code gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir 5.5.14 now Fix bug #67060: use default mode of 660 Conflicts: ext/date/php_date.c		2014-05-26 10:52:43 +04:00
..
examples	Sync ext/zip with pecl/zip version 1.3.2	2013-11-04 13:23:36 +01:00
lib	zip extension version 1.12.4	2014-01-29 14:00:50 +01:00
tests	Merge branch 'master' into phpng	2014-05-26 10:52:43 +04:00
config.m4	Sync with pecl/zip 1.12.4dev	2013-12-30 07:35:30 +01:00
config.w32	Sync with pecl/zip 1.12.4dev	2013-12-30 07:35:30 +01:00
CREDITS	Sync ext/zip with pecl/zip version 1.3.2	2013-11-04 13:23:36 +01:00
LICENSE_libzip	add bundled libzip LICENSE, as required by BSD License terms	2013-10-29 09:02:24 +01:00
php_zip.c	Merge branch 'master' into phpng	2014-05-26 10:52:43 +04:00
php_zip.h	Refactor Zip (1 test failed)	2014-05-05 10:49:27 +08:00
TODO	- MFH:	2006-11-03 16:46:19 +00:00
zip_stream.c	Refactor Zip (1 test failed)	2014-05-05 10:49:27 +08:00