summaryrefslogtreecommitdiff
path: root/ext/zip
Commit message (Collapse)AuthorAgeFilesLines
* Use reference counting instead of zval duplicationDmitry Stogov2014-06-051-6/+2
|
* Merge branch 'master' into phpngDmitry Stogov2014-05-263-1/+102
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Merge branch 'new-tests' of https://github.com/SammyK/php-srcXinchen Hui2014-05-242-0/+101
| |\
| | * Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()Sammy Kaye Powers2014-05-232-0/+101
| | |
| | * Bump yearXinchen Hui2014-01-032-2/+2
| | |
* | | Fix ZTSNikita Popov2014-05-051-1/+1
| | |
* | | clean upXinchen Hui2014-05-051-16/+0
| | |
* | | Finish Zip (all tests pass)Xinchen Hui2014-05-051-2/+6
| | |
* | | Romove unnecessary proxy macroXinchen Hui2014-05-051-11/+9
| | |
* | | Fixed memory leak in prop_handlers registeringXinchen Hui2014-05-051-1/+5
| | |
* | | Don't use this (keyword)Xinchen Hui2014-05-051-102/+102
| | |
* | | Refactor Zip (1 test failed)Xinchen Hui2014-05-055-360/+223
| | |
* | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-263-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During merge I had to revert: Nikita's patch for php_splice() (it probably needs to be applyed again) Bob Weinand's patches related to constant expression handling (we need to review them carefully) I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway) Conflicts: Zend/zend.h Zend/zend_API.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_compile.h Zend/zend_constants.c Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_highlight.c Zend/zend_language_parser.y Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_variables.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/date/php_date.c ext/dom/documenttype.c ext/hash/hash.c ext/iconv/iconv.c ext/mbstring/tests/zend_multibyte-10.phpt ext/mbstring/tests/zend_multibyte-11.phpt ext/mbstring/tests/zend_multibyte-12.phpt ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/php_mysqlnd.c ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_util_funcs.c ext/opcache/zend_persist.c ext/opcache/zend_persist_calc.c ext/pcre/php_pcre.c ext/pdo/pdo_dbh.c ext/pdo/pdo_stmt.c ext/pdo_pgsql/pgsql_driver.c ext/pgsql/pgsql.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_array.c ext/spl/spl_observer.c ext/standard/array.c ext/standard/basic_functions.c ext/standard/html.c ext/standard/mail.c ext/standard/php_array.h ext/standard/proc_open.c ext/standard/streamsfuncs.c ext/standard/user_filters.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_variables.c sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg_help.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_print.c sapi/phpdbg/phpdbg_prompt.c
| * | add OPSYS_Z_CPM missing constantRemi Collet2014-03-071-0/+1
| | |
| * | zip extension version 1.12.4Remi Collet2014-01-292-2/+2
| | |
* | | Cleanup (1-st round)Dmitry Stogov2014-04-151-3/+3
| | |
* | | Refactor basename using zend_stringXinchen Hui2014-02-232-21/+20
|/ /
* | Bump yearXinchen Hui2014-01-0319-19/+19
| |
* | missing file from libzip 0.11.2Remi Collet2013-12-303-0/+211
| |
* | fix compat for PHP ABI changesRemi Collet2013-12-301-8/+22
| |
* | Sync with pecl/zip 1.12.4devRemi Collet2013-12-3031-111/+400
| | | | | | | | | | | | | | | | | | | | - update bunled libzip to 0.11.2 - expose zip_file_set_external_attributes + zip_file_get_external_attributes with new methods: ZipArchive::setExternalAttributesName ZipArchive::setExternalAttributesIndex ZipArchive::getExternalAttributesName ZipArchive::getExternalAttributesIndex
* | Align 'configure --help' columnsChristopher Jones2013-12-201-2/+2
| |
* | save a few memoryRemi Collet2013-12-191-3/+3
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2013-12-191-1/+1
|\ \ | | | | | | | | | | | | * PHP-5.5: Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
| * \ Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-12-191-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
| | * Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)Remi Collet2013-12-191-1/+1
| | |
* | | missing 'config.h' in 5dc37b3Remi Collet2013-11-101-0/+25
| | |
* | | Merge branch 'pull-request/500'Anatol Belski2013-11-051-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/500: limit virtual_cwd_activate() duplicated call to ZTS only reverted the previous commit, both calls are needed in TS mode virtual_cwd_activate() should be called only in one place back to do_alloca() removed unnecessary call simplify the state free macros compact the code to preserve the error info after state freeing back to do_alloca(), reverted the wrong replacement enabled windows to use stack in both ts/nts mode, some more fixes moved to do_alloca() usage where appropriate fixed invalid free fixed virtual cwd header in phar updated NEWS fixed all the places where last error could be lost preserve the error code applied and fixed the original patch initial move on renaming files and fixing includes Conflicts: ext/opcache/ZendAccelerator.c
| * | | applied and fixed the original patchAnatol Belski2013-10-171-8/+8
| | | | | | | | | | | | | | | | initial work on the patch import done
* | | | Sync ext/zip with pecl/zip version 1.3.2Remi Collet2013-11-0499-1870/+4813
| | | | | | | | | | | | | | | | | | | | | | | | - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
* | | | Merge branch 'PHP-5.5'Remi Collet2013-10-291-0/+27
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * PHP-5.5: add bundled libzip LICENSE, as required by BSD License terms
| * | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-10-291-0/+27
| |\ \ \ | | | |/ | | |/| | | | | | | | | * PHP-5.4: add bundled libzip LICENSE, as required by BSD License terms
| | * | add bundled libzip LICENSE, as required by BSD License termsRemi Collet2013-10-291-0/+27
| | | |
* | | | Merge branch 'PHP-5.5'Rasmus Lerdorf2013-10-201-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.5: When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
| * | | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2013-10-201-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.4: When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
| | * | When src->src is null this doesn't get initializedRasmus Lerdorf2013-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
* | | | Merge branch 'PHP-5.5'Felipe Pena2013-10-201-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.5: - Moved NULL check before dereferencing
| * | | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-10-201-4/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.4: - Moved NULL check before dereferencing
| | * | - Moved NULL check before dereferencingFelipe Pena2013-10-201-4/+4
| | | |
* | | | Merge branch 'PHP-5.5'Felipe Pena2013-10-201-4/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * PHP-5.5: - Fix possible memory leak
| * | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-10-201-4/+5
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: - Fix possible memory leak
| | * - Fix possible memory leakFelipe Pena2013-10-201-4/+5
| | |
* | | Merge branch 'PHP-5.5'Christopher Jones2013-08-141-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/gmp/gmp.c
| * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-141-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.4: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/dba/libinifile/inifile.c
| | * Reduce (some) compile noise of 'unused variable' and 'may be used ↵Christopher Jones2013-08-141-1/+1
| | | | | | | | | | | | uninitialized' warnings.
| | * Merge branch 'pull-request/341'Stanislav Malyshev2013-06-103-3/+3
| | | | | | | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | | Merge branch '2Guploads'Michael Wallner2013-08-091-5/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2Guploads: add NEWS entry; add simple test more precise condition make this work in vc11 too Use int64_t and atoll() after discussion with johannes ws Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G. unify stdint type usage
| * | | unify stdint type usageMichael Wallner2013-08-061-5/+1
| | | | | | | | | | | | | | | | if you need C99 stdint types, just include "php_stdint.h"
* | | | Merge branch 'PHP-5.5'Christopher Jones2013-08-061-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * PHP-5.5: Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
| * | Fix long-standing visual pain point: the misalignment of './configure help' ↵Christopher Jones2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | text. Whitespace changes and a couple of grammar fixes.
View Lorry Controller Status