summaryrefslogtreecommitdiff
path: root/ext/phar
Commit message (Expand)AuthorAgeFilesLines
* Bump yearXinchen Hui2014-01-0318-18/+18
* Merge branch 'pull-request/500'Anatol Belski2013-11-051-1/+1
|\
| * Merge branch 'bug50333' of github.com:weltling/php-src into bug50333Anatol Belski2013-10-291-1/+1
| |\
| | * fixed virtual cwd header in pharAnatol Belski2013-10-181-1/+1
* | | Merge branch 'PHP-5.5'Xinchen Hui2013-11-052-9/+5
|\ \ \
| * | | Remove outdate codes, make it clearer, although just a bit..Xinchen Hui2013-11-056-546/+6
* | | | Merge branch 'PHP-5.5'Xinchen Hui2013-11-041-1/+2
|\ \ \ \ | |/ / /
| * | | Fixed coredump due to abnormal implemention of pharXinchen Hui2013-11-041-1/+2
* | | | Merge branch 'PHP-5.5'Xinchen Hui2013-10-271-4/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-10-271-4/+0
| |\ \ \
| | * | | remove "PHP 6" staffXinchen Hui2013-10-271-4/+0
* | | | | Merge branch 'PHP-5.5'Felipe Pena2013-10-201-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-10-201-2/+4
| |\ \ \ \ | | |/ / /
| | * | | - Fixed possible NULL ptr dereferenceFelipe Pena2013-10-201-2/+4
* | | | | Merge branch 'PHP-5.5'Xinchen Hui2013-10-191-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Need a way to check whether this API exists"Xinchen Hui2013-10-191-1/+0
* | | | | Merge branch 'PHP-5.5'Xinchen Hui2013-10-191-0/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Need a way to check whether this API existsXinchen Hui2013-10-191-0/+1
* | | | Merge branch 'PHP-5.5'Xinchen Hui2013-10-182-3/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Retruning SUCCESS/FAILURE instead of intXinchen Hui2013-10-182-3/+2
* | | Merge branch 'PHP-5.5'Xinchen Hui2013-10-173-2/+18
|\ \ \ | |/ /
| * | Add ability of alias resolving (it cause problem while work with opcache)Xinchen Hui2013-10-173-2/+18
* | | fix test concurrencyMichael Wallner2013-09-181-7/+7
* | | fix test concurrencyMichael Wallner2013-09-1843-115/+116
* | | Remove some more unnecessary macros from pharNikita Popov2013-09-136-45/+30
* | | Remove PHAR_(Z)STR* usagesNikita Popov2013-09-135-120/+33
* | | Remove version checks in pharNikita Popov2013-09-136-538/+2
* | | unify stdint type usageMichael Wallner2013-08-061-3/+0
* | | Fix phar phpinfo test after markup changesNikita Popov2013-08-031-15/+15
* | | Merge branch 'PHP-5.5'Christopher Jones2013-08-012-2/+2
|\ \ \
| * | | Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"Christopher Jones2013-08-012-2/+2
* | | | Merge branch 'PHP-5.5'Christopher Jones2013-07-312-2/+2
|\ \ \ \ | |/ / /
| * | | Allow 'make distclean' to clean up the 'generated' phar.incChristopher Jones2013-07-312-2/+2
| |/ /
* | | Constify streams API and a few other calls down the rabbit hole.Andrey Hristov2013-07-307-32/+30
|/ /
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-07-232-0/+179
|\ \ | |/
| * fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some sp...Stanislav Malyshev2013-07-222-0/+179
* | HASH_KEY_NON_EXISTANT fixVeres Lajos2013-07-214-12/+12
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-07-024-0/+530
|\ \ | |/
| * Fixed Bug #65142 Missing phar man pageRemi Collet2013-07-024-0/+530
| * Merge branch 'pull-request/341'Stanislav Malyshev2013-06-102-2/+2
* | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-102-2/+2
* | Merge branch 'PHP-5.4' into PHP-5.5Pierre Joye2013-05-171-4/+5
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Pierre Joye2013-05-171-4/+5
| |\
| | * other fix for #64214, unmodified file may not have old fp set, causing other ...Pierre Joye2013-05-171-4/+5
* | | Merge branch 'PHP-5.4' into PHP-5.5Pierre Joye2013-05-144-7/+56
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Pierre Joye2013-05-144-7/+56
| |\ \ | | |/
| | * more check for php_stream_fopen_tmpfile failurePierre Joye2013-05-144-7/+56
* | | Merge branch 'PHP-5.4' into PHP-5.5Pierre Joye2013-05-141-0/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Pierre Joye2013-05-141-0/+4
| |\ \ | | |/
| | * php_stream_fopen_tmpfile may file, causing any following stream usage to crashPierre Joye2013-05-141-0/+4