summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch 'pull-request/2128' into PHP-7.0Christoph M. Becker2016-09-291-0/+3
| |\ \ \
| | * | | Add CURLE_SSL_PINNEDPUBKEYNOTMATCHChristoph M. Becker2016-09-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This error constant is returned on key mismatch when CURLOPT_PINNEDPUBLICKEY is used. As the option had been introduced in PHP 7.0.7, it makes sense to also add the related error constant to PHP 7.0+. Cf. <https://curl.haxx.se/libcurl/c/CURLOPT_PINNEDPUBLICKEY.html>.
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-292-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-7.0: sync win32 makefile with makedist zendparse exports
| * | | | sync win32 makefile with makedist zendparse exportsAnatol Belski2016-09-292-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | With a newer bison this part is relevant. Whil bison 2.4.1 is still used, this changes cater for the forward compatibility.
* | | | | zval_dtor_func_for_ptr() -> zval_dtor_func()Dmitry Stogov2016-09-291-1/+1
| | | | |
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-09-291-3/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-7.0: Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
| * | | | Better fix for bug #72854 (avoid extra copy and creating reference to stack ↵Dmitry Stogov2016-09-291-3/+11
| | |/ / | |/| | | | | | | | | | variable)
* | | | Merge branch 'PHP-7.0' into PHP-7.1Ferenc Kovacs2016-09-290-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Ferenc Kovacs2016-09-290-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: configure.in main/php_version.h
| | * | 5.6.28 is nextFerenc Kovacs2016-09-293-5/+7
| | | |
* | | | Updated to version 2016.7 (2016g)Derick Rethans2016-09-281-2139/+2027
| | | |
* | | | Empty mergeDerick Rethans2016-09-280-0/+0
|\ \ \ \ | |/ / /
| * | | Updated to version 2016.7 (2016g)Derick Rethans2016-09-281-2139/+2027
| | | |
| * | | Empty mergeDerick Rethans2016-09-280-0/+0
| |\ \ \ | | |/ /
| | * | Updated to version 2016.7 (2016g)Derick Rethans2016-09-281-2139/+2027
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-284-2/+38
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-09-284-2/+38
| |\ \ \ | | |/ /
| | * | Handle resource keys in constexpr arraysNikita Popov2016-09-282-0/+18
| | | |
| | * | Fix the constant array case as wellNikita Popov2016-09-283-3/+15
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-283-17/+84
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-09-283-17/+84
| |\ \ \ | | |/ /
| | * | Check next_index_insert failure in ADD_ARRAY_ELEMENTNikita Popov2016-09-283-21/+100
| | | |
* | | | Prepare to Re-roll 7.1.0RC3Davey Shafik2016-09-281-5/+1
| | | |
* | | | Combine code for keyed/unkeyed list()Nikita Popov2016-09-281-58/+29
| | | |
* | | | Fix segfault when empty entry in keyed array assignmentNikita Popov2016-09-282-8/+20
| | | |
* | | | fix exports which are now referenced by phpdbgAnatol Belski2016-09-282-4/+4
| | | | | | | | | | | | | | | | (cherry picked from commit cd0f1c8a5ed6d4e677dbf891fc69326e5b05cccc)
* | | | Update UPGRADING to reflect new realityDavey Shafik2016-09-281-3/+0
| | | |
* | | | Update NEWS for 7.1.0RC4Davey Shafik2016-09-281-1/+5
| | | |
* | | | Update NEWSDavey Shafik2016-09-281-0/+4
| | | |
* | | | Don't mark ReflectionType::__toString() as deprecated for nowNikita Popov2016-09-283-12/+6
| | | |
* | | | Revert ReflectionType::__toString() behavior + deprecateNikita Popov2016-09-289-26/+25
| | | |
* | | | Ensure symtable exists before checking itNikita Popov2016-09-282-1/+21
| | | |
* | | | Add phpdbg generator commandBob Weinand2016-09-289-67/+253
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-273-2/+28
|\ \ \ \ | |/ / /
| * | | Fix bug #73181Nikita Popov2016-09-273-3/+29
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-270-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.0: prepare next
| * | | prepare nextAnatol Belski2016-09-273-5/+9
| | | |
* | | | update NEWSAdam Baratz2016-09-261-0/+1
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Adam Baratz2016-09-261-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-7.0: update NEWS Ignore potentially misleading dberr values
| * | | update NEWSAdam Baratz2016-09-261-0/+1
| | | |
| * | | Ignore potentially misleading dberr valuesChris Kings-Lynne2016-09-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FreeTDS had a buggy behavior where it would pass invalid values: https://sourceforge.net/p/freetds/bugs/59/ The fix for this issue -- bc22b2ef817fb5d102bd758111ff3634b39a1319 on their repo -- was to always use SYBESMSG for dberr. This makes it so the existing pdo_dblib code would work as is. But by ignoring the dberr value in this function, it will behave correctly, even with older versions of FreeTDS.
* | | | update NEWSAnatol Belski2016-09-261-0/+1
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-260-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.0: update NEWS
| * | | update NEWSAnatol Belski2016-09-261-0/+1
| | | |
| * | | Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0Anatol Belski2016-09-262-0/+24
| |\ \ \
* | \ \ \ Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1Anatol Belski2016-09-262-0/+24
|\ \ \ \ \
| * \ \ \ \ Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-262-0/+24
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-262-0/+24
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fix #53745: cgi.discard_path option is missing from php.iniChristoph M. Becker2016-09-262-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Also cgi.check_shebang_line has been missing.
* | | | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-263-2/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | * PHP-7.0: Fixed bug #73172 parse error: Invalid numeric literal