Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reimplemented Bob's commit bac6fdb0c52c924e726c5a78de8858bf27b6586b without i... | Dmitry Stogov | 2016-05-06 | 1 | -1/+1 |
* | Revert "Refactor zval cleanup into single function" | Dmitry Stogov | 2016-05-06 | 1 | -1/+1 |
* | Merge branch 'PHP-7.0' | Anatol Belski | 2016-05-06 | 2 | -11/+10 |
|\ | |||||
| * | Re-fix #72165 | Anatol Belski | 2016-05-06 | 2 | -0/+22 |
| * | Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new" | Anatol Belski | 2016-05-06 | 2 | -26/+3 |
* | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-05-06 | 2 | -3/+26 |
|\ \ | |/ | |||||
| * | Fixed bug #72165 Null pointer dereference - openssl_csr_new | Anatol Belski | 2016-05-06 | 2 | -3/+26 |
* | | Refactor zval cleanup into single function | Bob Weinand | 2016-05-05 | 1 | -1/+1 |
* | | Update comments consistently (#var0 -> #v) | Dmitry Stogov | 2016-05-05 | 1 | -7/+7 |
* | | Refactor DFA pass for better readability | Dmitry Stogov | 2016-05-05 | 1 | -178/+207 |
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-05-05 | 2 | -6/+26 |
|\ \ | |/ | |||||
| * | Fixed bug #72164 (Null Pointer Dereference - mb_ereg_replace) | Xinchen Hui | 2016-05-05 | 2 | -6/+26 |
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-05-05 | 2 | -10/+32 |
|\ \ | |/ | |||||
| * | Fixed bug #72154 (pcntl_wait/pcntl_waitpid array internal structure overwrite) | Xinchen Hui | 2016-05-05 | 2 | -10/+32 |
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-05-05 | 2 | -5/+23 |
|\ \ | |/ | |||||
| * | Fixed bug #72157 (use-after-free caused by dba_open) | Xinchen Hui | 2016-05-05 | 2 | -5/+23 |
* | | Merge branch 'PHP-7.0' | Nikita Popov | 2016-05-05 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Fix JMPZ, JMPZNZ_EX chain optimization | Nikita Popov | 2016-05-05 | 1 | -2/+2 |
* | | Fixed type inference rules. | Dmitry Stogov | 2016-05-04 | 1 | -8/+8 |
* | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-05-03 | 3 | -0/+53 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2016-05-03 | 3 | -0/+53 |
| |\ | |||||
| | * | add test fo rbug 71805 | Anatol Belski | 2016-05-03 | 3 | -0/+53 |
* | | | hide implementation details in tests | Joe Watkins | 2016-05-02 | 3 | -8/+8 |
* | | | Merge remote-tracking branch 'origin/PHP-7.0' | Bob Weinand | 2016-05-02 | 7 | -3/+465 |
|\ \ \ | |/ / | |||||
| * | | Implement socket_export_stream() | Chris Wright | 2016-05-02 | 7 | -3/+465 |
* | | | Add missing update_constants in ReflectionClassConstant | Nikita Popov | 2016-05-02 | 3 | -17/+71 |
* | | | Ensure an ORDER BY gets the expected row order | Christopher Jones | 2016-05-02 | 1 | -10/+10 |
* | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-05-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | fix test if unlink fails occasionally | Anatol Belski | 2016-05-01 | 1 | -1/+1 |
* | | | Merge branch 'PHP-7.0' | Nikita Popov | 2016-05-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fix posix build | Nikita Popov | 2016-05-01 | 1 | -1/+1 |
* | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-05-01 | 1 | -2/+6 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #72133 (php_posix_group_to_array crashes if gr_passwd is NULL) | Xinchen Hui | 2016-05-01 | 1 | -2/+6 |
* | | | fix test | Anatol Belski | 2016-04-30 | 1 | -3/+3 |
* | | | Mark all $php_errormsg as refs to inhibit optimization | Nikita Popov | 2016-04-30 | 1 | -0/+13 |
* | | | Merge branch 'PHP-7.0' | Sara Golemon | 2016-04-30 | 1 | -1/+4 |
|\ \ \ | |/ / | |||||
| * | | Create temporary sqlite db in test dir rather than cwd (and clean it up) | Sara Golemon | 2016-04-30 | 1 | -1/+4 |
* | | | Revert code to use DUP instead of COPY | Nikita Popov | 2016-04-29 | 2 | -2/+2 |
* | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-04-29 | 3 | -19/+201 |
|\ \ \ | |/ / | |||||
| * | | fix test | Anatol Belski | 2016-04-29 | 1 | -0/+3 |
| * | | Expose some of the new curl constants to PHP userspace | Pierrick Charron | 2016-04-29 | 2 | -19/+198 |
* | | | Fix usages of zend_update_constant_ex | Nikita Popov | 2016-04-29 | 2 | -5/+2 |
* | | | Merge branch 'master' of https://github.com/php/php-src | Joe Watkins | 2016-04-29 | 3 | -6/+6 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of git.php.net:php-src | Dmitry Stogov | 2016-04-29 | 2 | -5/+6 |
| |\ \ \ | |||||
| | * | | | fix constants availability | Anatol Belski | 2016-04-29 | 1 | -4/+4 |
| * | | | | Merge branch 'PHP-7.0' | Dmitry Stogov | 2016-04-29 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Simplified condition | Dmitry Stogov | 2016-04-29 | 1 | -1/+1 |
| * | | | | | Merge branch 'PHP-7.0' | Dmitry Stogov | 2016-04-29 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | size_t is unsigned and can't be negative | Dmitry Stogov | 2016-04-29 | 1 | -1/+1 |
* | | | | | | Implement #51879 stream context socket option tcp_nodelay | Joe Watkins | 2016-04-29 | 4 | -25/+115 |
| |_|/ / / |/| | | | |