Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-11-23 | 1 | -1/+1 |
|\ | |||||
| * | added missing INSTALL_ROOT | Sebastian Brandt | 2014-11-23 | 1 | -1/+1 |
* | | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-23 | 1 | -1/+1 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-10-20 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | initialize lineno before calling compile file file in phar | Anatol Belski | 2014-10-20 | 1 | -0/+1 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-08-11 | 4 | -4/+8 |
|\ \ | |/ | |||||
| * | Fixed tests affect by local ini | Xinchen Hui | 2014-07-09 | 4 | -4/+8 |
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-07-08 | 1 | -0/+1 |
| |\ | |||||
| | * | Fix bug #67587: Redirection loop on nginx with FPM | Christian Weiske | 2014-07-08 | 1 | -0/+1 |
* | | | Fix bug #67587: Redirection loop on nginx with FPM | Christian Weiske | 2014-07-08 | 1 | -0/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Felipe Pena | 2014-05-11 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Felipe Pena | 2014-05-11 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org) | Felipe Pena | 2014-05-11 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-22 | 3 | -126/+187 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-22 | 3 | -126/+187 |
| |\ \ | | |/ | |||||
| | * | Fix accepting ill-formed UTF-8 characters | Jakub Zelenka | 2014-04-22 | 3 | -127/+188 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-20 | 4 | -61/+160 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-20 | 4 | -61/+160 |
| |\ \ | | |/ | |||||
| | * | Allow valid multi-byte utf-8 characters to be allowed as file names in phar a... | Danack | 2014-04-20 | 4 | -62/+161 |
| | * | Bump year | Xinchen Hui | 2014-01-03 | 18 | -18/+18 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Bob Weinand | 2014-04-14 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | Bump year | Xinchen Hui | 2014-01-03 | 18 | -18/+18 |
* | | | Bump year | Xinchen Hui | 2014-01-03 | 18 | -18/+18 |
* | | | Merge branch 'pull-request/500' | Anatol Belski | 2013-11-05 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'bug50333' of github.com:weltling/php-src into bug50333 | Anatol Belski | 2013-10-29 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | fixed virtual cwd header in phar | Anatol Belski | 2013-10-18 | 1 | -1/+1 |
* | | | | | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-11-05 | 2 | -9/+5 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Remove outdate codes, make it clearer, although just a bit.. | Xinchen Hui | 2013-11-05 | 6 | -546/+6 |
* | | | | | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-11-04 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed coredump due to abnormal implemention of phar | Xinchen Hui | 2013-11-04 | 1 | -1/+2 |
* | | | | | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-10-27 | 1 | -4/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-10-27 | 1 | -4/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | remove "PHP 6" staff | Xinchen Hui | 2013-10-27 | 1 | -4/+0 |
* | | | | | Merge branch 'PHP-5.5' | Felipe Pena | 2013-10-20 | 1 | -2/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Felipe Pena | 2013-10-20 | 1 | -2/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | - Fixed possible NULL ptr dereference | Felipe Pena | 2013-10-20 | 1 | -2/+4 |
* | | | | | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-10-19 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Revert "Need a way to check whether this API exists" | Xinchen Hui | 2013-10-19 | 1 | -1/+0 |
* | | | | | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-10-19 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | Need a way to check whether this API exists | Xinchen Hui | 2013-10-19 | 1 | -0/+1 |
* | | | | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-10-18 | 2 | -3/+2 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Retruning SUCCESS/FAILURE instead of int | Xinchen Hui | 2013-10-18 | 2 | -3/+2 |
* | | | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-10-17 | 3 | -2/+18 |
|\ \ \ | |/ / | |||||
| * | | Add ability of alias resolving (it cause problem while work with opcache) | Xinchen Hui | 2013-10-17 | 3 | -2/+18 |
* | | | fix test concurrency | Michael Wallner | 2013-09-18 | 1 | -7/+7 |
* | | | fix test concurrency | Michael Wallner | 2013-09-18 | 43 | -115/+116 |
* | | | Remove some more unnecessary macros from phar | Nikita Popov | 2013-09-13 | 6 | -45/+30 |
* | | | Remove PHAR_(Z)STR* usages | Nikita Popov | 2013-09-13 | 5 | -120/+33 |
* | | | Remove version checks in phar | Nikita Popov | 2013-09-13 | 6 | -538/+2 |
* | | | unify stdint type usage | Michael Wallner | 2013-08-06 | 1 | -3/+0 |