summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-10-052-8/+6
|\
| * Update run command for allowing STDINBob Weinand2016-10-051-7/+5
| |
| * Remove phpdbg fix targeting 7.1 which landed in 7.0Bob Weinand2016-10-051-11/+0
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-10-031-1/+1
|\ \ | |/
| * Fix crash on Linux due to double fclose()Bob Weinand2016-10-031-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-10-029-254/+288
|\ \ | |/
| * Fix run command args passing when inmidst executionBob Weinand2016-10-029-254/+288
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-10-015-110/+564
|\ \ | |/
| * Add proper escape sequences and reading stdin from file in phpdbg run commandBob Weinand2016-10-015-110/+564
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-10-011-0/+11
|\ \ | |/
| * Fix invalid access to interned strings after they are freed in phpdbgBob Weinand2016-10-011-0/+11
| |
* | Add phpdbg generator commandBob Weinand2016-09-286-62/+242
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Julien Pauli2016-09-231-16/+19
|\ \ | |/ | | | | | | | | | | | | | | * PHP-7.0: Formatting. Fix possible memory corruption in FPM SHM management fix every work call mmap Conflicts: sapi/fpm/fpm/fpm_scoreboard.c
| * Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-231-17/+20
| |\ | | | | | | | | | | | | | | | * PHP-5.6: Formatting. Fix possible memory corruption in FPM SHM management fix every work call mmap
| | * Formatting. Fix possible memory corruption in FPM SHM managementJulien Pauli2016-09-231-12/+16
| | |
| | * fix every work call mmaptom9162016-09-231-13/+12
| | | | | | | | | | | | fix fpm_scoreboard_free
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-232-3/+44
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.0: update NEWS phpdbg next command must stop when leaving function
| * | phpdbg next command must stop when leaving functionBob Weinand2016-09-232-3/+44
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1George Wang2016-09-191-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0George Wang2016-09-191-2/+2
| |\ \ | | |/
| | * Fix wrong year in previous commit.George Wang2016-09-191-2/+2
| | |
| | * backport 59444347 and 3d7343f6Anatol Belski2016-09-083-0/+12
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-041-2/+16
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
| * | phpdbg: couple of network function return checks. PossibleDavid Carlier2016-09-041-2/+16
| | | | | | | | | | | | overflow when copy the socket_path configuration.
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-031-0/+2
|\ \ \ | |/ /
| * | Fix bug #72996Nikita Popov2016-09-031-0/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-291-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: fix dealloc mismatch
| * | fix dealloc mismatchAnatol Belski2016-08-291-1/+1
| | |
* | | code cleanup.George Wang2016-08-281-7/+0
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1George Wang2016-08-281-58/+357
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0George Wang2016-08-281-58/+357
| |\ \ | | |/ | | | | | | | | | Conflicts: sapi/litespeed/lsapi_main.c
| | * Added .user.ini support.George Wang2016-08-281-32/+489
| | | | | | | | | | | | | | | Added LSPHPRC support. update LiteSpeed SAPI version to 6.10 .
| | * Fix bug #72836 - integer overflow in base64_decode caused heap corruptionStanislav Malyshev2016-08-162-0/+489
| | |
* | | Fix some typos in PHP FPM configurationMatthias Endler2016-08-151-6/+6
| | | | | | | | | | | | [skip ci]
* | | pull ps_title behind the logic to support the current codepageAnatol Belski2016-08-111-23/+14
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-08-091-6/+2
|\ \ \ | |/ /
| * | Don't copy mime types in CLI serverNikita Popov2016-08-091-6/+2
| | | | | | | | | | | | This is both unnecessary and causes leaks in valgrind.
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-281-1/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-281-1/+6
| |\ \ | | |/
| | * Fix #72676: Test cli_process_title_unix fails on AIXChristoph M. Becker2016-07-281-1/+6
| | | | | | | | | | | | Patch provided by matthieu dot sarter dot external at atos dot net.
* | | Merge branch 'PHP-7.0' into PHP-7.1Remi Collet2016-07-222-3/+84
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: FPM: add test for CVE-2016-5385
| * | Merge branch 'PHP-5.6' into PHP-7.0Remi Collet2016-07-222-3/+84
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: FPM: add test for CVE-2016-5385
| | * FPM: add test for CVE-2016-5385Remi Collet2016-07-222-3/+84
| | |
* | | add missing header to fix buildAnatol Belski2016-07-191-0/+2
| | |
* | | correct macro namesAnatol Belski2016-07-171-2/+2
| | |
* | | Disable optimizer when it conflicts with phpdbg testsBob Weinand2016-07-132-0/+4
| | |
* | | Remove bogus zend_signal_shutdown symbol from headerBob Weinand2016-07-131-7/+6
| | |
* | | Cleanup zend_/signal usage in phpdbg.cBob Weinand2016-07-132-25/+10
| | |
* | | Fix phpdbg ZTS watchpoint+shutdown sequences & opcache+watchpointsBob Weinand2016-07-122-156/+174
| | |
* | | Merge branch 'PHP-7.0'Julien Pauli2016-07-121-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-7.0: Updated NEWS Updated NEWS Fix #72575: using --allow-to-run-as-root should ignore missing user directive