summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-171-1/+1
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-171-1/+1
| |\
| | * fixed possibly uninitialized value usageAnatol Belski2013-12-171-1/+1
* | | Save one char compareXinchen Hui2013-12-171-1/+1
* | | Fixed test failed after rev 57c1335fXinchen Hui2013-12-171-2/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2013-12-161-1/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-12-161-1/+6
| |\ \ | | |/
| | * Fix bug #65873 - Integer overflow in exif_read_data()Stanislav Malyshev2013-12-161-1/+6
| * | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-12-1613-42/+42
| |\ \
| | * \ Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5Xinchen Hui2013-12-151-1/+1
| | |\ \
| * | \ \ Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-12-121-0/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-12-121-2/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Dmitry Stogov2013-12-1613-42/+42
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6Xinchen Hui2013-12-15515-6163/+20835
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-141-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| * | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2013-12-1512-41/+41
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Fix tests expecting specific resource IDsEric Stenson2013-12-1512-41/+41
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-141-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | fixed parameter order for zend_throw_exception_ex callAnatol Belski2013-12-141-1/+1
* | | | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Dmitry Stogov2013-12-133-6/+23
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | OCI8 build change: Fix source variable definition for C89 compatibilityChristopher Jones2013-12-123-6/+23
* | | | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Dmitry Stogov2013-12-121-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2013-12-121-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-121-0/+2
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | fix testMichael Wallner2013-12-121-0/+2
* | | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Dmitry Stogov2013-12-121-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-121-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Fixed bug #65486 mysqli_poll() is broken on Win x64Anatol Belski2013-12-121-2/+2
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2013-12-122-2/+4
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Fixed testsDmitry Stogov2013-12-121-2/+3
| * | | Fixed ext/soap/tests/bugs/bug54911.phptDmitry Stogov2013-12-121-0/+1
| |/ /
* | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2013-12-071-16/+11
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-12-071-16/+11
| |\ \ | | |/
| | * Switch to using freetype-config for freetype detection.Adam Harvey2013-12-071-16/+11
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-111-0/+2
|\ \ \ | |/ /
| * | added missing prototypeAnatol Belski2013-12-111-0/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-111-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-111-1/+1
| |\ \ | | |/
| | * Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-12-111-1/+1
| | |\
| | | * fix dir separator in cve-2013-6420 testAnatol Belski2013-12-111-1/+1
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2013-12-103-4/+61
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-12-103-4/+61
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Stanislav Malyshev2013-12-102-40/+47
| | |\ \
| | * \ \ Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-12-103-4/+61
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fix CVE-2013-6420 - memory corruption in openssl_x509_parseStanislav Malyshev2013-12-103-4/+61
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2013-12-102-40/+47
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-12-102-40/+47
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixed Bug #66218 zend_register_functions breaks reflectionRemi Collet2013-12-102-40/+47
| | |/ /
* | | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2013-12-103-94/+180
|\ \ \ \ | |/ / /
| * | | Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot ko...Dmitry Stogov2013-12-103-94/+180
View Lorry Controller Status