summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.1'Joe Watkins2017-01-021-1/+7
|\
| * Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVEvanviegen2017-01-021-1/+7
* | Merge branch 'PHP-7.1'Joe Watkins2017-01-022-1/+19
|\ \ | |/
| * Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-022-1/+19
| |\
| | * Fixed #67474 (getElementsByTagNameNS and default namespace)Arnout Boks2017-01-021-1/+1
| | * Add (failing) testcase for bug #67474Arnout Boks2017-01-021-0/+18
| | * Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0Joe Watkins2017-01-02101-1501/+2736
| | |\
| | * | Fix nowait.phpt to no longer depend on sleepingMitch Hagstrand2017-01-021-65/+92
| * | | Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1Joe Watkins2017-01-0210-116/+26
| |\ \ \
* | \ \ \ Merge branch 'master' of git.php.net:/php-srcJoe Watkins2017-01-0217-636/+257
|\ \ \ \ \
| * | | | | Switch reflection to use smart_strNikita Popov2017-01-011-311/+227
| * | | | | Move smart_string to ZendNikita Popov2017-01-012-142/+4
| * | | | | Merge branch 'PHP-7.1'Nikita Popov2017-01-0112-177/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-018-110/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Flush stderr on win32 in cli_log_messageNikita Popov2017-01-018-110/+0
| | * | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-012-6/+26
| | |\ \ \ \ | | | |/ / /
| | | * | | Fixed bug #73154Nikita Popov2017-01-012-6/+26
| * | | | | Fixed bug #73154Nikita Popov2017-01-012-6/+26
* | | | | | Merge branch 'PHP-7.1'Joe Watkins2017-01-021-65/+92
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fix nowait.phpt to no longer depend on sleepingMitch Hagstrand2017-01-021-65/+92
| |/ / /
* | | | fix testJoe Watkins2017-01-011-1/+1
* | | | Merge branch 'PHP-7.1'Joe Watkins2017-01-011-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'pull-request/1414' into PHP-7.1Joe Watkins2017-01-011-1/+1
| |\ \ \
| | * | | Fix rebase errorTom Sommer2015-07-141-1/+1
| | * | | Add subject to mail.logTom Sommer2015-07-141-1/+1
* | | | | Merge branch 'PHP-7.1'Nikita Popov2017-01-013-477/+535
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-013-9/+43
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2017-01-013-480/+537
| | |\ \ \
| | | * | | FIx bug #70213Nikita Popov2017-01-013-474/+531
* | | | | | Merge branch 'PHP-7.1'Nikita Popov2017-01-011-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-011-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix dom class can't be inherited by the internal classdreamszhu2017-01-011-1/+1
* | | | | | Merge branch 'PHP-7.1'Nikita Popov2017-01-011-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix year dependent testNikita Popov2017-01-011-4/+4
| * | | | | Revert "Fix dom class can't be inherited by the internal class"Joe Watkins2017-01-011-1/+1
* | | | | | Revert "Merge branch 'PHP-7.1'"Joe Watkins2017-01-011-1/+1
* | | | | | Merge branch 'PHP-7.1'Joe Watkins2017-01-011-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix dom class can't be inherited by the internal classdreamszhu2017-01-011-1/+1
* | | | | | Merge branch 'pull-request/2261'Joe Watkins2017-01-012-3/+5
|\ \ \ \ \ \
| * | | | | | Add PHPAPI php_session_flush and php_session_destroydreamszhu2017-01-012-3/+5
* | | | | | | Use new param API in pdo_sqliteSara Golemon2016-12-311-12/+17
* | | | | | | Use new param API in tokenizerSara Golemon2016-12-311-6/+8
* | | | | | | Use new param API in PDOSara Golemon2016-12-312-49/+67
* | | | | | | Use new param API in libxmlSara Golemon2016-12-311-13/+16
* | | | | | | Use new param API in jsonSara Golemon2016-12-311-6/+13
* | | | | | | Merge branch 'master' of git.php.net:/php-srcJoe Watkins2016-12-312-0/+50
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'PHP-7.1'Nikita Popov2016-12-312-0/+50
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix bug #73847Nikita Popov2016-12-312-0/+50
* | | | | | | | Merge branch 'pull-request/2260'Joe Watkins2016-12-311-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add PHPAPI for session class entrydreamszhu2016-12-311-4/+4
| | |/ / / / / | |/| | | | |