summaryrefslogtreecommitdiff
path: root/ext/phar
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-231-1/+1
|\
| * added missing INSTALL_ROOTSebastian Brandt2014-11-231-1/+1
* | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-1/+1
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-10-201-0/+1
|\ \ | |/
| * initialize lineno before calling compile file file in pharAnatol Belski2014-10-201-0/+1
* | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-08-114-4/+8
|\ \ | |/
| * Fixed tests affect by local iniXinchen Hui2014-07-094-4/+8
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-07-081-0/+1
| |\
| | * Fix bug #67587: Redirection loop on nginx with FPMChristian Weiske2014-07-081-0/+1
* | | Fix bug #67587: Redirection loop on nginx with FPMChristian Weiske2014-07-081-0/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Felipe Pena2014-05-111-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2014-05-111-1/+1
| |\ \ | | |/
| | * - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)Felipe Pena2014-05-111-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-223-126/+187
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-223-126/+187
| |\ \ | | |/
| | * Fix accepting ill-formed UTF-8 charactersJakub Zelenka2014-04-223-127/+188
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-204-61/+160
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-204-61/+160
| |\ \ | | |/
| | * Allow valid multi-byte utf-8 characters to be allowed as file names in phar a...Danack2014-04-204-62/+161
| | * Bump yearXinchen Hui2014-01-0318-18/+18
* | | Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2014-04-141-2/+4
|\ \ \ | |/ /
| * | Bump yearXinchen Hui2014-01-0318-18/+18
* | | 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