summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-07-242-4/+4
|\
| * Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-07-242-4/+4
| |\
| | * Update copyright year to 2017Peter Kokot2017-07-242-4/+4
* | | Merge branch 'PHP-7.1' into PHP-7.2Xinchen Hui2017-07-211-1284/+1223
|\ \ \ | |/ /
* | | Merge branch 'PHP-7.1'Joe Watkins2017-07-171-1/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-07-171-1/+5
| |\ \ | | |/
| | * Fixed bug 74913 redirecting incorrect include <sys/poll.h>Peter Kokot2017-07-171-1/+5
* | | Fixed bug #74849 Process is started as interactive shell in PhpStormAnatol Belski2017-07-031-2/+1
* | | Merge branch 'PHP-7.1'George Wang2017-06-271-10/+18
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1George Wang2017-06-271-10/+18
| |\ \ | | |/
| | * [BUGFIX] fixes the issue that a value from .user.ini displays in phpinfo(), b...George Wang2017-06-271-10/+18
* | | Remove superfluous semicolonsTom Van Looy2017-06-261-5/+5
* | | Fixed php_socket_t to int conversionRichard Fussenegger2017-06-151-1/+1
* | | Merge branch 'PHP-7.1'Xinchen Hui2017-06-121-0/+46
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-06-121-0/+46
| |\ \ | | |/
| | * Add simple cli test for PATH/HOST ini sectionsManuel Mausz2017-06-091-0/+46
* | | Exclude warm-up requests from callgrind profile.Dmitry Stogov2017-05-311-0/+12
* | | missing fix for another testRemi Collet2017-05-291-1/+2
* | | extend conditionAnatol Belski2017-05-271-1/+1
* | | Turn interactive mode on, if cli binary is clicked in filemanagerAnatol Belski2017-05-251-0/+5
* | | Remove `user=foo` from FPM test configSara Golemon2017-05-242-2/+0
* | | Skip FPM tests when running as root (unless requested)Sara Golemon2017-05-242-2/+9
* | | Merge branch 'PHP-7.1'Xinchen Hui2017-05-171-0/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-171-0/+4
| |\ \ | | |/
| | * Added cleanupXinchen Hui2017-05-171-0/+4
* | | Merge branch 'PHP-7.1'Xinchen Hui2017-05-171-0/+34
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-171-0/+34
| |\ \ | | |/
| | * Added test for bug #74600Xinchen Hui2017-05-171-0/+34
* | | Merge branch 'hybrid-vm'Dmitry Stogov2017-05-091-1/+1
|\ \ \
| * | | Implemented HYBRID VM instruction dispatch method that takes advantages of bo...Dmitry Stogov2017-05-031-1/+1
* | | | Merge branch 'PHP-7.1'Xinchen Hui2017-05-091-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-091-1/+1
| |\ \ | | |/
| | * Fix typo: exectute => executeAndrew Marcinkevičius2017-05-081-1/+1
| | * Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0Joe Watkins2017-04-101-1/+1
| | |\
| * | \ Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1Joe Watkins2017-04-102-2/+2
| |\ \ \
* | | | | Fix bug 60471 by correctly identifying unused speculative preconnectionsSammy Kaye Powers2017-04-113-74/+80
* | | | | Merge branch 'master' of git.php.net:/php-srcJoe Watkins2017-04-102-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'PHP-7.1'Xinchen Hui2017-04-102-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fixed condition checkXinchen Hui2017-04-101-1/+1
| | * | | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-04-101-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fixed condition checkXinchen Hui2017-04-101-1/+1
* | | | | | Merge branch 'PHP-7.1'Joe Watkins2017-04-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-04-101-1/+1
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Fixed bug #74400 (phpdbg comparing socket function to int)Joe Watkins2017-04-101-1/+1
| | |/
* | | Merge branch 'PHP-7.1'Anatol Belski2017-04-031-2/+1
|\ \ \ | |/ /
| * | fix buffer overflowAnatol Belski2017-04-031-2/+1
* | | Remove superfluous allocation checks around ZMM-based functionsThomas Punt2017-04-021-2/+0
* | | Update tests and add NEWS entry for phpdbg opcode dump changeSara Golemon2017-03-295-15/+15
* | | Add extended_value to phpdbg opcode dumpSara Golemon2017-03-291-0/+5
* | | Merge branch 'PHP-7.1'Anatol Belski2017-03-282-47/+1
|\ \ \ | |/ /