summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed bug #73783David Walker2016-12-293-4/+38
* Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-292-21/+36
|\
| * Fix flaky openssl_pkey_new testNikita Popov2016-12-291-7/+7
| * Make Opcache tests using the cli server more reliableMitch Hagstrand2016-12-291-14/+29
* | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-12-292-0/+7
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-12-292-0/+7
| |\
| | * Revert "Fix #73530: Unsetting result set may reset other result set"Christoph M. Becker2016-12-293-32/+8
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-12-291-1/+44
|\ \ \ | |/ /
| * | Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into P...Xinchen Hui2016-12-291-1/+44
| |\ \
| | * | define php_ap_map_http_request_error function for older httpd onlyZheng SHAO2016-12-291-31/+24
| | * | add old versions of httpd supportZheng SHAO2016-12-291-0/+34
| | * | Fixed NEWS conflictsZheng SHAO2016-12-2014-19/+232
| | |\ \
| | * | | typo fixedZheng SHAO2016-12-171-1/+1
| | * | | bug fixed #61471 in apache2handlerZheng SHAO2016-12-172-1/+20
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-271-3/+0
|\ \ \ \ \ | |/ / / /
| * | | | Disable AppVeyor fast_finishNikita Popov2016-12-271-3/+0
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-275-158/+127
|\ \ \ \ \ | |/ / / /
| * | | | Makes the sapi web server and curl tests more reliableMitch Hagstrand2016-12-275-123/+74
| * | | | Fixes the curl tests to be more reliable in Travis CIMitch Hagstrand2016-12-272-37/+55
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Sara Golemon2016-12-251-12/+7
|\ \ \ \ \ | |/ / / /
| * | | | Interpretation of curl_setopt values for boolean parametersdedal.qq2016-12-251-12/+7
* | | | | Remove extraneous parentheses in conditionsSébastien Santoro2016-12-252-34/+48
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Sara Golemon2016-12-251-2/+10
|\ \ \ \ \ | |/ / / /
| * | | | Fixes #65689. PDO_Firebrid / exec() does not free allocated statement.Dorin Marcoci2016-12-251-2/+10
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-12-221-2/+15
|\ \ \ \ \ | |/ / / /
| * | | | Fix alpn_ctx leaking in opensslBob Weinand2016-12-221-2/+15
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-12-223-2/+75
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #73373 (deflate_add does not verify that output was not truncated)Bob Weinand2016-12-223-2/+74
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-221-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fix IS_UNDEF comparisons in opcacheSébastien Santoro2016-12-221-2/+2
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-12-225-14/+61
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)Bob Weinand2016-12-225-14/+62
* | | | | Fix string extension in negate_num_stringNikita Popov2016-12-211-1/+1
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-211-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Increase timing quota for small string concat testNikita Popov2016-12-211-3/+3
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-213-3/+34
|\ \ \ \ \ | |/ / / /
| * | | | Fix #73753 - Unpacked Arrays and DuplicationDavid Walker2016-12-213-3/+34
* | | | | add foldsAnatol Belski2016-12-211-2/+2
* | | | | fix possible null dereferenceAnatol Belski2016-12-211-8/+10
* | | | | Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)Xinchen Hui2016-12-213-7/+17
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-12-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix issue with -- in phpdbg command lineBob Weinand2016-12-211-1/+1
* | | | | Fixed bug #73794 (Crash (out of memory) when using run and # command separator)Bob Weinand2016-12-203-0/+21
* | | | | Fix segfault in ZTS mode when just printing and exiting in phpdbgBob Weinand2016-12-201-1/+1
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-12-203-0/+24
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #73792 (invalid foreach loop hangs script)Dmitry Stogov2016-12-204-0/+51
| | |/ / | |/| |
* | | | Fixed bug #73789 (Strange behavior of class constants in switch/case block)Xinchen Hui2016-12-203-9/+45
* | | | deliver the real cp also if a constant is passedAnatol Belski2016-12-201-0/+11
* | | | Fixed arginfoDmitry Stogov2016-12-191-0/+1
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-12-191-2/+6
|\ \ \ \ | |/ / /