summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump yearXinchen Hui2014-01-03878-888/+888
* Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-01-030-0/+0
|\
| * Bump yearXinchen Hui2014-01-03836-847/+847
| * Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2014-01-030-0/+0
| |\
| | * Bump yearXinchen Hui2014-01-03807-817/+817
* | | Merge branch 'PHP-5.5' into PHP-5.6Derick Rethans2014-01-020-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-01-020-0/+0
| |\ \ | | |/
| | * Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Derick Rethans2014-01-0216-30/+286
| | |\
* | | \ Merge branch 'PHP-5.5' into PHP-5.6Derick Rethans2014-01-021-40/+8
|\ \ \ \ | |/ / /
| * | | Fixed (some of) add/sub.Derick Rethans2014-01-021-40/+8
| * | | - BFNFelipe Pena2014-01-011-0/+1
* | | | Merge branch 'PHP-5.5' into PHP-5.6krakjoe2014-01-011-18/+25
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5krakjoe2014-01-011-18/+25
| |\ \ \ | | | |/ | | |/|
| | * | fix #66375 bad logic in sapi header callback routinekrakjoe2014-01-011-18/+25
* | | | Merge branch 'PHP-5.5' into PHP-5.6Felipe Pena2014-01-012-3/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5Felipe Pena2014-01-0115-669/+852
| |\ \ \
| * | | | - Fixed bug #66381 (__ss_family was changed on AIX 5.3)Felipe Pena2014-01-012-3/+4
* | | | | Throw warning when converting invalid string to GMPNikita Popov2013-12-3014-5/+47
* | | | | update php.ini-*Michael Wallner2013-12-302-6/+8
* | | | | Add E_DEPRECATED when populating $HTTP_RAW_POST_DATAMichael Wallner2013-12-304-1/+12
* | | | | add 'never'Michael Wallner2013-12-301-0/+3
* | | | | fix typeMichael Wallner2013-12-301-1/+1
* | | | | fix type; add tests for -1Michael Wallner2013-12-302-0/+45
* | | | | s/BOOLEAN/ENTRY/Michael Wallner2013-12-301-1/+1
* | | | | re-introduce always_populate_raw_post_dataMichael Wallner2013-12-305-0/+100
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2013-12-302-0/+8
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Nikita Popov2013-12-302-0/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix leak caused by fix to bug #65667Nikita Popov2013-12-302-0/+8
* | | | | missing file from libzip 0.11.2Remi Collet2013-12-303-0/+211
* | | | | fix compat for PHP ABI changesRemi Collet2013-12-301-8/+22
* | | | | NEWSRemi Collet2013-12-302-2/+8
* | | | | Sync with pecl/zip 1.12.4devRemi Collet2013-12-3031-111/+400
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2013-12-301-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix test failXinchen Hui2013-12-301-0/+1
* | | | | Fix one more test in dos style eolXinchen Hui2013-12-301-42/+42
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2013-12-303-126/+126
|\ \ \ \ \ | |/ / / /
| * | | | Fix dos style eol in phptsXinchen Hui2013-12-303-126/+126
* | | | | Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as ...Xinchen Hui2013-12-303-719/+719
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2013-12-300-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as ...Xinchen Hui2013-12-304-486/+488
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2013-12-281-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | minor fix on previousRemi Collet2013-12-281-1/+2
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2013-12-282-22/+52
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())Remi Collet2013-12-283-23/+54
* | | | | update version outputkrakjoe2013-12-271-2/+1
* | | | | Fixed bug #66358 (fpm starts segfault)Xinchen Hui2013-12-271-1/+1
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2013-12-270-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Revert accidented committed php_version.hXinchen Hui2013-12-271-3/+3
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2013-12-272-34/+169
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())Xinchen Hui2013-12-274-37/+173