summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0'Nikita Popov2016-06-283-68/+81
|\ | | | | | | | | | | Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
| * Make call_user_func() on reference args consistentNikita Popov2016-06-283-71/+84
| | | | | | | | | | | | Previously reference arguments were allowed if call_user_func() was compiled to SEND_USER and not otherwise. Make it consistent by always forbidding them.
* | Remove assert for nowNikita Popov2016-06-281-1/+0
| |
* | Use DO_UCALL for method callsNikita Popov2016-06-281-3/+3
| |
* | More type inferences fixesNikita Popov2016-06-282-31/+54
| |
* | Fixed compilation warningsDmitry Stogov2016-06-2815-48/+40
| |
* | Fix bug #72099: xml_parse_into_struct segmentation faultStanislav Malyshev2016-06-281-1/+1
| |
* | Fixed buildXinchen Hui2016-06-281-1/+1
| |
* | Merge branch 'PHP-7.0'Xinchen Hui2016-06-281-2/+0
|\ \ | |/ | | | | | | * PHP-7.0: Fixed test
| * Fixed testXinchen Hui2016-06-281-2/+0
| |
* | Update NEWSXinchen Hui2016-06-281-0/+4
| |
* | Merge branch 'PHP-7.0'Xinchen Hui2016-06-282-2/+48
|\ \ | |/ | | | | | | * PHP-7.0: Fixed bug #72508 (strange references after recursive function call and "switch" statement)
| * Fixed bug #72508 (strange references after recursive function call and ↵Xinchen Hui2016-06-283-2/+52
| | | | | | | | "switch" statement)
* | Merge branch 'PHP-7.0'Xinchen Hui2016-06-281-1/+0
|\ \ | |/ | | | | | | | | | | | | | | * PHP-7.0: MFH: Fixed fd leak (the origin commit can not be cherry-picked) Conflicts: main/fastcgi.c sapi/cli/ps_title.c
| * MFH: Fixed fd leak (the origin commit can not be cherry-picked)Xinchen Hui2016-06-284-3/+10
| |
* | Merge branch 'master' of https://github.com/devnexen/php-srcXinchen Hui2016-06-284-2/+10
|\ \ | | | | | | | | | | | | * 'master' of https://github.com/devnexen/php-src: couple of resource leaks fixes and use after free's
| * \ Merge branch 'master' of https://github.com/php/php-srcDavid Carlier2016-06-274-4/+14
| |\ \
| * \ \ Merge branch 'master' of https://github.com/php/php-srcDavid Carlier2016-06-270-0/+0
| |\ \ \
| * | | | couple of resource leaks fixes and use after free'sDavid Carlier2016-06-2716-37/+801
| | | | |
* | | | | Updated NEWSXinchen Hui2016-06-281-0/+1
| | | | |
* | | | | Merge branch 'PHP-7.0'Xinchen Hui2016-06-281-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * PHP-7.0: Fixed bug #72505 (readfile() mangles files larger than 2G)
| * | | | Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0Xinchen Hui2016-06-282-0/+61
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-7.0' of git.php.net:/php-src: Fix the fix for #72403 on nl2br Update NEWS Update NEWS Fix #70628: Clearing bindings on an SQLite3 statement doesn't work 5.5.38 now
| * | | | | Fixed bug #72505 (readfile() mangles files larger than 2G)Xinchen Hui2016-06-282-1/+2
| | | | | |
* | | | | | Update NEWSDavey Shafik2016-06-271-0/+1
| | | | | |
* | | | | | Merge support for HTTP/2 Server Push in ext/curlDavey Shafik2016-06-273-104/+238
|\ \ \ \ \ \
| * | | | | | Implement curl server pushDavey Shafik2016-06-273-5/+124
| | | | | | |
| * | | | | | Refactor easy handle lookupDavey Shafik2016-06-271-29/+38
| | | | | | |
| * | | | | | Refactor setup of handlers on copied curl handlesDavey Shafik2016-06-272-70/+76
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-06-270-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: Fix the fix for #72403 on nl2br 5.5.38 now
| * | | | | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-06-270-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix the fix for #72403 on nl2br 5.5.38 now Conflicts: ext/standard/string.c
| | * \ \ \ \ Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-06-271-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix the fix for #72403 on nl2br 5.5.38 now Conflicts: configure.in main/php_version.h
| | | * | | | | Fix the fix for #72403 on nl2brStanislav Malyshev2016-06-271-1/+1
| | | | | | | |
| | | * | | | | 5.5.38 nowJulien Pauli2016-06-213-5/+9
| | | | | | | |
* | | | | | | | Merge branch 'precise_float'Jakub Zelenka2016-06-2713-48/+235
|\ \ \ \ \ \ \ \
| * | | | | | | | Update NEWS and UPGRADINGJakub Zelenka2016-06-272-0/+11
| | | | | | | | |
| * | | | | | | | Use one place to define max length of doubleJakub Zelenka2016-06-265-37/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new constant PHP_DOUBLE_MAX_LENGTH for that purpose
| * | | | | | | | Change default for serialize_precision to -1 (use mode 0)Jakub Zelenka2016-06-262-2/+8
| | | | | | | | |
| * | | | | | | | Add decimal point in double serializationJakub Zelenka2016-06-262-10/+5
| | | | | | | | |
| * | | | | | | | Replace json.precision with serialize_precisionJakub Zelenka2016-06-263-40/+2
| | | | | | | | |
| * | | | | | | | Avoid magic number. NUM_BUF_SIZE may be in header. Suggestions are appreciatedYasuo Ohgaki2016-06-261-3/+14
| | | | | | | | |
| * | | | | | | | Add better value to testYasuo Ohgaki2016-06-261-15/+22
| | | | | | | | |
| * | | | | | | | Remove unneeded WS changeYasuo Ohgaki2016-06-261-2/+0
| | | | | | | | |
| * | | | | | | | Remove unneeded output from testYasuo Ohgaki2016-06-261-14/+0
| | | | | | | | |
| * | | | | | | | Fix mode when precision=0. Add testYasuo Ohgaki2016-06-262-1/+172
| | | | | | | | |
| * | | | | | | | Add castYasuo Ohgaki2016-06-261-1/+1
| | | | | | | | |
| * | | | | | | | Enable 0 mode for echo/printYasuo Ohgaki2016-06-262-3/+3
| | | | | | | | |
| * | | | | | | | Simply use ndigit for flag for zend_dtoa modeYasuo Ohgaki2016-06-263-28/+9
| | | | | | | | |
| * | | | | | | | Add JSON_G(precision)Yasuo Ohgaki2016-06-263-3/+41
| | | | | | | | |
| * | | | | | | | Initial patch for 0 mode float conversion. The magic number is better to be ↵Yasuo Ohgaki2016-06-265-17/+61
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | improved. Any suggestion where to define it?
* | | | | | | | Update NEWSChristoph M. Becker2016-06-271-0/+4
| | | | | | | |