Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-02 | 1 | -1/+7 |
|\ | |||||
| * | Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE | vanviegen | 2017-01-02 | 1 | -1/+7 |
* | | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-02 | 2 | -1/+19 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-02 | 2 | -1/+19 |
| |\ | |||||
| | * | Fixed #67474 (getElementsByTagNameNS and default namespace) | Arnout Boks | 2017-01-02 | 1 | -1/+1 |
| | * | Add (failing) testcase for bug #67474 | Arnout Boks | 2017-01-02 | 1 | -0/+18 |
| | * | Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 | Joe Watkins | 2017-01-02 | 101 | -1501/+2736 |
| | |\ | |||||
| | * | | Fix nowait.phpt to no longer depend on sleeping | Mitch Hagstrand | 2017-01-02 | 1 | -65/+92 |
| * | | | Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 | Joe Watkins | 2017-01-02 | 10 | -116/+26 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'master' of git.php.net:/php-src | Joe Watkins | 2017-01-02 | 17 | -636/+257 |
|\ \ \ \ \ | |||||
| * | | | | | Switch reflection to use smart_str | Nikita Popov | 2017-01-01 | 1 | -311/+227 |
| * | | | | | Move smart_string to Zend | Nikita Popov | 2017-01-01 | 2 | -142/+4 |
| * | | | | | Merge branch 'PHP-7.1' | Nikita Popov | 2017-01-01 | 12 | -177/+0 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-01-01 | 8 | -110/+0 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Flush stderr on win32 in cli_log_message | Nikita Popov | 2017-01-01 | 8 | -110/+0 |
| | * | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-01-01 | 2 | -6/+26 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Fixed bug #73154 | Nikita Popov | 2017-01-01 | 2 | -6/+26 |
| * | | | | | Fixed bug #73154 | Nikita Popov | 2017-01-01 | 2 | -6/+26 |
* | | | | | | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-02 | 1 | -65/+92 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Fix nowait.phpt to no longer depend on sleeping | Mitch Hagstrand | 2017-01-02 | 1 | -65/+92 |
| |/ / / | |||||
* | | | | fix test | Joe Watkins | 2017-01-01 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'pull-request/1414' into PHP-7.1 | Joe Watkins | 2017-01-01 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix rebase error | Tom Sommer | 2015-07-14 | 1 | -1/+1 |
| | * | | | Add subject to mail.log | Tom Sommer | 2015-07-14 | 1 | -1/+1 |
* | | | | | Merge branch 'PHP-7.1' | Nikita Popov | 2017-01-01 | 3 | -477/+535 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-01-01 | 3 | -9/+43 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'PHP-5.6' into PHP-7.0 | Nikita Popov | 2017-01-01 | 3 | -480/+537 |
| | |\ \ \ | |||||
| | | * | | | FIx bug #70213 | Nikita Popov | 2017-01-01 | 3 | -474/+531 |
* | | | | | | Merge branch 'PHP-7.1' | Nikita Popov | 2017-01-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-01-01 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fix dom class can't be inherited by the internal class | dreamszhu | 2017-01-01 | 1 | -1/+1 |
* | | | | | | Merge branch 'PHP-7.1' | Nikita Popov | 2017-01-01 | 1 | -4/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fix year dependent test | Nikita Popov | 2017-01-01 | 1 | -4/+4 |
| * | | | | | Revert "Fix dom class can't be inherited by the internal class" | Joe Watkins | 2017-01-01 | 1 | -1/+1 |
* | | | | | | Revert "Merge branch 'PHP-7.1'" | Joe Watkins | 2017-01-01 | 1 | -1/+1 |
* | | | | | | Merge branch 'PHP-7.1' | Joe Watkins | 2017-01-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fix dom class can't be inherited by the internal class | dreamszhu | 2017-01-01 | 1 | -1/+1 |
* | | | | | | Merge branch 'pull-request/2261' | Joe Watkins | 2017-01-01 | 2 | -3/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add PHPAPI php_session_flush and php_session_destroy | dreamszhu | 2017-01-01 | 2 | -3/+5 |
* | | | | | | | Use new param API in pdo_sqlite | Sara Golemon | 2016-12-31 | 1 | -12/+17 |
* | | | | | | | Use new param API in tokenizer | Sara Golemon | 2016-12-31 | 1 | -6/+8 |
* | | | | | | | Use new param API in PDO | Sara Golemon | 2016-12-31 | 2 | -49/+67 |
* | | | | | | | Use new param API in libxml | Sara Golemon | 2016-12-31 | 1 | -13/+16 |
* | | | | | | | Use new param API in json | Sara Golemon | 2016-12-31 | 1 | -6/+13 |
* | | | | | | | Merge branch 'master' of git.php.net:/php-src | Joe Watkins | 2016-12-31 | 2 | -0/+50 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'PHP-7.1' | Nikita Popov | 2016-12-31 | 2 | -0/+50 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Fix bug #73847 | Nikita Popov | 2016-12-31 | 2 | -0/+50 |
* | | | | | | | | Merge branch 'pull-request/2260' | Joe Watkins | 2016-12-31 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add PHPAPI for session class entry | dreamszhu | 2016-12-31 | 1 | -4/+4 |
| | |/ / / / / | |/| | | | | |