summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* MFH: Fixed fd leak (the origin commit can not be cherry-picked)Xinchen Hui2016-06-282-2/+7
* Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify router...Xinchen Hui2016-06-241-4/+1
* Fixed bug #72308 (fastcgi_finish_request and logging environment variables)Xinchen Hui2016-06-021-1/+1
* fix conditionAnatol Belski2016-05-301-1/+1
* Fixed bug #72284 (phpdbg fatal errors with coverage)Bob Weinand2016-05-301-3/+6
* Merge branch 'PHP-5.6' into PHP-7.0Adam Harvey2016-05-251-1/+1
|\
| * Fix typo in phpdbg help.Adam Harvey2016-05-251-1/+1
* | Merge branch 'PHP-5.6' into PHP-7.0Adam Harvey2016-05-251-1/+3
|\ \ | |/
| * Add missing newlines to phpdbg's help for the run command.Adam Harvey2016-05-251-1/+3
* | fix size_t signed comparisonJoe Watkins2016-04-291-1/+1
* | Merge branch 'PHP-5.6' into PHP-7.0Ferenc Kovacs2016-04-181-0/+6
|\ \ | |/
| * mark frequent intermittent fpm test with XFAILFerenc Kovacs2016-04-181-0/+6
* | Fixed failed with libeditXinchen Hui2016-04-151-0/+3
* | phpdbg: close file handlesJoe Watkins2016-04-121-0/+2
* | Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not pr...Sean DuBois2016-03-152-4/+46
* | Eliminate usages of _PP macrosNikita Popov2016-03-031-5/+0
* | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-03-034-5/+23
|\ \ | |/
| * Fixed bug #69953Christoph M. Becker2016-03-034-5/+23
* | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-038-8/+8
* | Fix bug #71575 removing extra semicolons outside macrosJames Titcumb2016-03-0323-23/+23
* | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-03-031-0/+4
|\ \ | |/
| * Disable upload_2G test on travisNikita Popov2016-03-031-0/+4
| * fix ts buldAnatol Belski2016-02-181-1/+1
* | PHP-7 zend_call_function() doesn't support symbol_table substitutionDmitry Stogov2016-03-021-1/+2
* | Merge branch 'PHP-7.0.4' into PHP-7.0Stanislav Malyshev2016-03-011-1/+1
|\ \
| * \ Merge branch 'PHP-5.6.19' into PHP-7.0.4Stanislav Malyshev2016-03-011-1/+1
| |\ \
| | * | fix ts buldphp-5.6.19RC1Anatol Belski2016-02-181-1/+1
| | |/
* | | Fix crash when advancing inside an internal functionBob Weinand2016-02-174-15/+27
|/ /
* | fpm: call zend_signal_init() in childMickaël2016-02-151-0/+4
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-02-141-0/+13
|\ \ | |/
| * Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bugAnatol Belski2016-02-141-0/+13
* | Format string fixesNikita Popov2016-02-148-25/+38
* | Fix format attributes in ZTSNikita Popov2016-02-141-9/+0
* | Fixed inherited functions from unspecified files being included in phpdbg_get...Bob Weinand2016-02-111-1/+1
* | Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0Joe Watkins2016-02-105-5/+29
|\ \
| * \ Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-02-082-2/+2
| |\ \ | | |/
| | * Align spacing in make install messagesLior Kaplan2016-02-082-2/+2
| * | phpdbg config.m4: make it detectable by old shellsGuillaume Outters2016-01-291-1/+1
| * | Merge branch 'PHP-5.6' into PHP-7.0Remi Collet2016-01-291-1/+25
| |\ \ | | |/
| | * Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setupRemi Collet2016-01-291-1/+25
| * | Use uint64_t for flags (warning)Bob Weinand2016-01-231-1/+1
* | | be more precise about the meaning of -nJoe Watkins2016-02-101-1/+1
|/ /
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-01-181-5/+5
|\ \ | |/
| * fix testAnatol Belski2016-01-181-5/+5
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-01-111-9/+9
|\ \ | |/
| * Simplify code per Anatol.Adam Harvey2016-01-112-41/+8
| * Insert bug number.Adam Harvey2016-01-111-1/+1
| * Use strtoll() when apr_off_t is 64 bits.Adam Harvey2016-01-112-9/+42
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-01-051-0/+5
| |\
| | * Fixed bug #70755: fpm_log.c memory leak and buffer overflowStanislav Malyshev2015-12-081-0/+5
View Lorry Controller Status