| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Bump year | Xinchen Hui | 2014-01-03 | 878 | -888/+888 |
| | | |||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-01-03 | 0 | -0/+0 |
| |\ | |||||
| | * | Bump year | Xinchen Hui | 2014-01-03 | 836 | -847/+847 |
| | | | |||||
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2014-01-03 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Bump year | Xinchen Hui | 2014-01-03 | 807 | -817/+817 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Derick Rethans | 2014-01-02 | 0 | -0/+0 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Derick Rethans | 2014-01-02 | 0 | -0/+0 |
| | |\ \ | | |/ | |||||
| | | * | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 | Derick Rethans | 2014-01-02 | 16 | -30/+286 |
| | | |\ | |||||
| * | | \ | Merge branch 'PHP-5.5' into PHP-5.6 | Derick Rethans | 2014-01-02 | 1 | -40/+8 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Fixed (some of) add/sub. | Derick Rethans | 2014-01-02 | 1 | -40/+8 |
| | | | | | | | | | | | | | | | | | | | | | This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable this code was not correctly merged. | ||||
| | * | | | - BFN | Felipe Pena | 2014-01-01 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6 | krakjoe | 2014-01-01 | 1 | -18/+25 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-5.5: fix #66375 bad logic in sapi header callback routine | ||||
| | * | | | Merge branch 'PHP-5.4' into PHP-5.5 | krakjoe | 2014-01-01 | 1 | -18/+25 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | * PHP-5.4: fix #66375 bad logic in sapi header callback routine | ||||
| | | * | | fix #66375 bad logic in sapi header callback routine | krakjoe | 2014-01-01 | 1 | -18/+25 |
| | | | | | |||||
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Felipe Pena | 2014-01-01 | 2 | -3/+4 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-5.5: - Fixed bug #66381 (__ss_family was changed on AIX 5.3) | ||||
| | * | | | Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 | Felipe Pena | 2014-01-01 | 15 | -669/+852 |
| | |\ \ \ | |||||
| | * | | | | - Fixed bug #66381 (__ss_family was changed on AIX 5.3) | Felipe Pena | 2014-01-01 | 2 | -3/+4 |
| | | | | | | |||||
| * | | | | | Throw warning when converting invalid string to GMP | Nikita Popov | 2013-12-30 | 14 | -5/+47 |
| | | | | | | |||||
| * | | | | | update php.ini-* | Michael Wallner | 2013-12-30 | 2 | -6/+8 |
| | | | | | | |||||
| * | | | | | Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA | Michael Wallner | 2013-12-30 | 4 | -1/+12 |
| | | | | | | |||||
| * | | | | | add 'never' | Michael Wallner | 2013-12-30 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | fix type | Michael Wallner | 2013-12-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fix type; add tests for -1 | Michael Wallner | 2013-12-30 | 2 | -0/+45 |
| | | | | | | |||||
| * | | | | | s/BOOLEAN/ENTRY/ | Michael Wallner | 2013-12-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | re-introduce always_populate_raw_post_data | Michael Wallner | 2013-12-30 | 5 | -0/+100 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2013-12-30 | 2 | -0/+8 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Nikita Popov | 2013-12-30 | 2 | -0/+8 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | Fix leak caused by fix to bug #65667 | Nikita Popov | 2013-12-30 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | ftp->stream is now closed in the ftp resource dtor. | ||||
| * | | | | | missing file from libzip 0.11.2 | Remi Collet | 2013-12-30 | 3 | -0/+211 |
| | | | | | | |||||
| * | | | | | fix compat for PHP ABI changes | Remi Collet | 2013-12-30 | 1 | -8/+22 |
| | | | | | | |||||
| * | | | | | NEWS | Remi Collet | 2013-12-30 | 2 | -2/+8 |
| | | | | | | |||||
| * | | | | | Sync with pecl/zip 1.12.4dev | Remi Collet | 2013-12-30 | 31 | -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 | ||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2013-12-30 | 1 | -0/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Fix test fail | Xinchen Hui | 2013-12-30 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fix one more test in dos style eol | Xinchen Hui | 2013-12-30 | 1 | -42/+42 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2013-12-30 | 3 | -126/+126 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Fix dos style eol in phpts | Xinchen Hui | 2013-12-30 | 3 | -126/+126 |
| | | | | | | |||||
| * | | | | | Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as ↵ | Xinchen Hui | 2013-12-30 | 3 | -719/+719 |
| | | | | | | | | | | | | | | | | | | | | | lineend) | ||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2013-12-30 | 0 | -0/+0 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as ↵ | Xinchen Hui | 2013-12-30 | 4 | -486/+488 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lineend) Use git blame -w to ingore the space changes | ||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2013-12-28 | 1 | -1/+2 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-5.5: minor fix on previous | ||||
| | * | | | | minor fix on previous | Remi Collet | 2013-12-28 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2013-12-28 | 2 | -22/+52 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) | ||||
| | * | | | | Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) | Remi Collet | 2013-12-28 | 3 | -23/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial fix was PHP stuff This one is libgd fix. - filter invalid crop size - dont try to copy on invalid position - fix crop size when out of src image - fix possible NULL deref - fix possible integer overfloow | ||||
| * | | | | | update version output | krakjoe | 2013-12-27 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Fixed bug #66358 (fpm starts segfault) | Xinchen Hui | 2013-12-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2013-12-27 | 0 | -0/+0 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: main/php_version.h | ||||
| | * | | | | Revert accidented committed php_version.h | Xinchen Hui | 2013-12-27 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2013-12-27 | 2 | -34/+169 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: main/php_version.h | ||||
| | * | | | | Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) | Xinchen Hui | 2013-12-27 | 4 | -37/+173 |
| | | | | | | | | | | | | | | | | | | | | | And also fixed the bug: arguments are altered after some calls | ||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |