summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ext/pdo_odbc support for phpng (tested with unixODBC and mysql driver)Dmitry Stogov2014-08-122-50/+66
* ext/odbc support for phpng (incomplete)Dmitry Stogov2014-08-123-190/+164
* Fixed pdo_firebird tests failuresDmitry Stogov2014-08-113-5/+25
* Fixed modeDmitry Stogov2014-08-1110-0/+0
* Implemented ext/com_dotnet support for phpngDmitry Stogov2014-08-1113-429/+488
* Merge branch 'master' into testDmitry Stogov2014-08-1127-1376/+1905
|\
| * Merge branch 'PHP-5.6'Adam Harvey2014-08-080-0/+0
| |\
| | * Add __debugInfo() to UPGRADING.Adam Harvey2014-08-081-0/+4
| * | Merge branch 'PHP-5.6'Anatol Belski2014-08-071-1/+1
| |\ \ | | |/
| | * Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-071-1/+1
| | |\
| | | * Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-071-1/+1
| | | |\
| | | | * fix TS buildAnatol Belski2014-08-071-1/+1
| * | | | Merge branch 'PHP-5.6'Daniel Lowrey2014-08-070-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Update NEWSDaniel Lowrey2014-08-071-0/+4
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2014-08-070-0/+0
| | |\ \ \ | | | |/ /
| | | * | Update NEWSDaniel Lowrey2014-08-071-0/+3
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2014-08-070-0/+0
| | | |\ \ | | | | |/
| | | | * Update NEWSDaniel Lowrey2014-08-071-0/+4
| * | | | Merge branch 'PHP-5.6'Christopher Jones2014-08-071-17/+18
| |\ \ \ \
| | * \ \ \ Merge branch 'PHP-5.5' into PHP-5.6Christopher Jones2014-08-071-17/+18
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Small tidy ups and raise visibility of GitHub PR processChristopher Jones2014-08-071-30/+31
| | | |/ /
| * | | | Merge branch 'PHP-5.6'Daniel Lowrey2014-08-071-0/+46
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2014-08-071-0/+46
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2014-08-071-0/+46
| | | |\ \ | | | | |/
| | | | * Bug #41631: Observe socket read timeouts in SSL streamsDaniel Lowrey2014-08-071-0/+46
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-08-071-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-071-0/+4
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-071-0/+4
| | | |\ \ | | | | |/
| | | | * wrap int8_t and int16_t with #ifdef to avoid possible clashesAnatol Belski2014-08-071-0/+4
| * | | | Merge branch 'PHP-5.6'Derick Rethans2014-08-071-1315/+1389
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Derick Rethans2014-08-071-1315/+1389
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-08-071-1315/+1389
| | | |\ \ | | | | |/
| | | | * - Updated to version 2014.6 (2014f)Derick Rethans2014-08-071-1315/+1389
| | * | | Removed Countable::count() change info from UPGRADE.INTERNALS tooBob Weinand2014-08-061-12/+4
| * | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-08-060-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context opt...Ferenc Kovacs2014-08-066-76/+9
| * | | | NEWS and UPGRADING for intdiv()Andrea Faulds2014-08-062-1/+4
| * | | | Merge branch 'master' of git.php.net:php-srcAndrea Faulds2014-08-063-19/+158
| |\ \ \ \
| | * \ \ \ Merge branch 'PHP-5.6'Andrey Hristov2014-08-060-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-08-060-0/+0
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Andrey Hristov2014-08-063-4/+19
| | | | |\ \
| | | | | * | 5.5.17 nowJulien Pauli2014-08-063-4/+7
| | | * | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Andrey Hristov2014-08-066-9/+88
| | | |\ \ \ \
| | * | \ \ \ \ Merge branch 'master' of git.php.net:php-srcAndrey Hristov2014-08-0614-10/+172
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'PHP-5.6'Andrey Hristov2014-08-0612-34/+309
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Use callback structureAndrey Hristov2014-08-062-5/+7
| | | * | | | | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-08-0611-32/+305
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2014-08-061-12/+34
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | | * | | | Add EXPECTFAndrey Hristov2014-08-061-12/+34
| | | | * | | | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2014-08-0611-40/+281
| | | | |\ \ \ \ \ | | | | | |/ / / /