summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)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 ↵Xinchen Hui2016-06-241-4/+1
| | | | router.php)
* 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
| | | | Cherry-pick of original commits d3371b and 0f20e11 only present in master
* Merge branch 'PHP-5.6' into PHP-7.0Adam Harvey2016-05-251-1/+1
|\ | | | | | | | | * PHP-5.6: Fix typo in phpdbg help.
| * Fix typo in phpdbg help.Adam Harvey2016-05-251-1/+1
| | | | | | | | | | Sorry, I would have included this in the last push had I spotted it a minute earlier.
* | Merge branch 'PHP-5.6' into PHP-7.0Adam Harvey2016-05-251-1/+3
|\ \ | |/ | | | | | | * PHP-5.6: Add missing newlines to phpdbg's help for the run command.
| * Add missing newlines to phpdbg's help for the run command.Adam Harvey2016-05-251-1/+3
| | | | | | | | | | This is not at all related to needing screenshots for a talk I'm giving in two days. No sir. Not at all.
* | fix size_t signed comparisonJoe Watkins2016-04-291-1/+1
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Ferenc Kovacs2016-04-181-0/+6
|\ \ | |/ | | | | | | * PHP-5.6: mark frequent intermittent fpm test with XFAIL
| * 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 ↵Sean DuBois2016-03-152-4/+46
| | | | | | | | properly set $argi and $argn
* | Eliminate usages of _PP macrosNikita Popov2016-03-031-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | These are either in debug code (fix them), commented out (drop them) or in dead compatibility macros (drop them). One usage was in php_stream_get_from_zval(), which we have not used since at least PHP 5.2 and, judging from the fact that nobody complained about it causing compile errors in PHP 7, nobody else uses it either, so drop it. There are still remaining uses in mysqli embedded and odbc birdstep. These probably need to be dropped outright.
* | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-03-034-5/+23
|\ \ | |/
| * Fixed bug #69953Christoph M. Becker2016-03-034-5/+23
| | | | | | | | Added support for MKCALENDAR request method in CLI web server.
* | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-038-8/+8
| | | | | | | | Also re bug #71575.
* | 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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0.4: (21 commits) update NEWS fix test file Fix version update NEWS Update NEWS Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request() Fix bug #71637: Multiple Heap Overflow due to integer overflows extend check for add_flag Fixed another segfault with file_cache_only now set version fix nmake clean in phpize mode Fixed segfault with file_cache_only Fixed possible crash at PCRE on MSHUTDOWN Fixed more synchronisation issues during SHM reload Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string sync with improvements in NEWS Fixed process synchronisation problem, that may cause crashes after opcache restart Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile() fix ts buld prep for 5.6.19RC1 ... Conflicts: configure.in main/php_version.h
| * \ Merge branch 'PHP-5.6.19' into PHP-7.0.4Stanislav Malyshev2016-03-011-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.19: fix test file Fix version update NEWS Update NEWS Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile() fix ts buld prep for 5.6.19RC1 5.6.20 is next Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize Conflicts: configure.in ext/wddx/wddx.c main/php_version.h
| | * | fix ts buldphp-5.6.19RC1Anatol Belski2016-02-181-1/+1
| | |/
* | | Fix crash when advancing inside an internal functionBob Weinand2016-02-174-15/+27
|/ / | | | | | | This just happened in the "double ctrl+c" mode, when we halted inside an internal function; there was some code assuming a proper op_array
* | fpm: call zend_signal_init() in childMickaël2016-02-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses bug #71269. When an fpm child handles more than one request, zend_signal_startup() will override the saved signal handlers with the internal zend handlers set from the previous request, causing a SIGQUIT signal to result in a core dump rather than gracefully exiting (the expected behaviour). This is fixed by adding a call to zend_signal_init() after setting the signal handlers in the child. The same technique is used in the apache SAPI module in commit fd5a756ad44124ffa7e9a5810a31ff49e91708cf which addresses bug #61083.
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-02-141-0/+13
|\ \ | |/ | | | | | | * PHP-5.6: Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
| * 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
| | | | | | | | | | Conflicts: ext/pgsql/pgsql.c
* | Fix format attributes in ZTSNikita Popov2016-02-141-9/+0
| |
* | Fixed inherited functions from unspecified files being included in ↵Bob Weinand2016-02-111-1/+1
| | | | | | | | | | | | phpdbg_get_executable() See also https://github.com/krakjoe/phpdbg/issues/152
* | 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
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.6: Align spacing in make install messages Add entry for re-fix of #70976 in commit 14e4d393
| | * 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
| | | | | | | | | | | | | | | --enable-phpdbg is not detected on old systems (e.g.: stock FreeBSD 8), due to a PHPism in config.m4 (use of == operator). Replacing == with the historic = makes it pass.
| * | Merge branch 'PHP-5.6' into PHP-7.0Remi Collet2016-01-291-1/+25
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.6: NEWS Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
| | * Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setupRemi Collet2016-01-291-1/+25
| | | | | | | | | | | | Only needed with Apache version < 2.4.12 (ex RHEL-7)
| * | 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
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.6: fork test fix test fork test fork test for win32 fork test
| * fix testAnatol Belski2016-01-181-5/+5
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-01-111-9/+9
|\ \ | |/ | | | | | | | | | | * PHP-5.6: Simplify code per Anatol. Insert bug number. Use strtoll() when apr_off_t is 64 bits.
| * 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
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Update NEWS Improve fix for bug #70976 Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization) Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability Fixed #70728 Fixed bug #70755: fpm_log.c memory leak and buffer overflow Fix bug #70976: fix boundary check on gdImageRotateInterpolated typofix
| | * Fixed bug #70755: fpm_log.c memory leak and buffer overflowStanislav Malyshev2015-12-081-0/+5
| | |
View Lorry Controller Status