summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* Fixed sockets ext build on winAnatoliy Belsky2012-11-132-0/+4
* Merge branch 'PHP-5.4'Derick Rethans2012-11-131-540/+572
|\
| * Merge branch 'PHP-5.3' into PHP-5.4Derick Rethans2012-11-131-540/+572
| |\
| | * - Updated to version 2012.10 (2012j)Derick Rethans2012-11-131-540/+572
| | * Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3Derick Rethans2012-11-1312-18/+177
| | |\
| | | * fix invalid read when trimming empty stringAntony Dovgal2012-11-111-2/+4
| * | | Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4Derick Rethans2012-11-1316-23/+231
| |\ \ \
* | \ \ \ Merge branch 'master' of git.php.net:/php-srcDerick Rethans2012-11-137-5/+87
|\ \ \ \ \
| * \ \ \ \ Merge branch 'PHP-5.4'Adam Harvey2012-11-121-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Update arginfo for preg_match_all() to reflect reality.Adam Harvey2012-11-121-1/+1
| | * | | | fix invalid read when trimming empty stringAntony Dovgal2012-11-111-2/+4
| * | | | | fix invalid read when trimming empty stringAntony Dovgal2012-11-111-2/+4
| * | | | | Merge branch 'PHP-5.4'Xinchen Hui2012-11-074-0/+80
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-11-074-0/+80
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encod...Xinchen Hui2012-11-074-0/+80
| | | * | | Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3Rasmus Lerdorf2012-11-0573-29001/+40327
| | | |\ \ \
| | | * | | | These need to be volatile in order to prevent leaking after theRasmus Lerdorf2012-11-051-2/+2
| | * | | | | These need to be volatile in order to prevent leaking after theRasmus Lerdorf2012-11-051-2/+2
| * | | | | | These need to be volatile in order to prevent leaking after theRasmus Lerdorf2012-11-051-2/+2
* | | | | | | Merge branch 'PHP-5.4'Derick Rethans2012-11-041-29/+29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'PHP-5.3' into PHP-5.4Derick Rethans2012-11-041-29/+29
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | - Updated to version 2012.9 (2012i)Derick Rethans2012-11-041-29/+29
* | | | | | Merge branch 'PHP-5.4'Andrey Hristov2012-10-311-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'PHP-5.3' into PHP-5.4Andrey Hristov2012-10-311-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problemAndrey Hristov2012-10-311-1/+1
* | | | | | Allow setting SHA256 auth public key as optionJohannes Schlüter2012-10-313-2/+23
* | | | | | plug recent leakAndrey Hristov2012-10-311-0/+4
* | | | | | Merge branch 'master' of ssh://git.php.net/php-srcAndrey Hristov2012-10-3123-584/+1290
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'PHP-5.4'Xinchen Hui2012-10-313-4/+53
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves tra...Xinchen Hui2012-10-313-4/+53
| * | | | | | Merge branch 'PHP-5.4'David Soria Parra2012-10-302-1/+64
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4David Soria Parra2012-10-302-1/+64
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug #62593 Updated to account for INOUT parametersWill Fitch2012-10-301-1/+2
| | | * | | | Bug #62593 Updated test to verify bindParam doesn't change original valueWill Fitch2012-10-301-1/+3
| | | * | | | Bug #62593 Updated to always treat zval by valueWill Fitch2012-10-302-4/+9
| | | * | | | Bug #62593 Added test for changeWill Fitch2012-10-301-0/+44
| | | * | | | Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native fo...Will Fitch2012-10-301-1/+12
| * | | | | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-303-12/+26
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-303-12/+26
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | Fixed bug #63389 (Missing context check on libxml_set_streams_context() cause...Xinchen Hui2012-10-303-12/+26
| | | |/ /
| * | | | Merge branch 'PHP-5.4'Derick Rethans2012-10-271-452/+451
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.3' into PHP-5.4Derick Rethans2012-10-271-452/+451
| | |\ \ \ | | | |/ /
| | | * | - Updated to version 2012.8 (2012h)Derick Rethans2012-10-271-452/+451
| * | | | Merge branch 'PHP-5.4'Dmitry Stogov2012-10-261-0/+18
| |\ \ \ \ | | |/ / /
| | * | | Fixed bug #63180 (Corruption of hash tables)Dmitry Stogov2012-10-261-0/+18
| | * | | fix bug #63369Antony Dovgal2012-10-261-0/+5
| * | | | fix bug #63369Antony Dovgal2012-10-261-0/+5
| * | | | Merge branch 'PHP-5.4'Johannes Schlüter2012-10-261-8/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-10-261-8/+6
| | |\ \ \ | | | |/ /
| | | * | Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not us...ULF WENDEL2012-10-232-59/+71