Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-7.0' into PHP-7.1 | Bob Weinand | 2016-10-05 | 2 | -8/+6 |
|\ | |||||
| * | Update run command for allowing STDIN | Bob Weinand | 2016-10-05 | 1 | -7/+5 |
| | | |||||
| * | Remove phpdbg fix targeting 7.1 which landed in 7.0 | Bob Weinand | 2016-10-05 | 1 | -11/+0 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Bob Weinand | 2016-10-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix crash on Linux due to double fclose() | Bob Weinand | 2016-10-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Bob Weinand | 2016-10-02 | 9 | -254/+288 |
|\ \ | |/ | |||||
| * | Fix run command args passing when inmidst execution | Bob Weinand | 2016-10-02 | 9 | -254/+288 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Bob Weinand | 2016-10-01 | 5 | -110/+564 |
|\ \ | |/ | |||||
| * | Add proper escape sequences and reading stdin from file in phpdbg run command | Bob Weinand | 2016-10-01 | 5 | -110/+564 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Bob Weinand | 2016-10-01 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | Fix invalid access to interned strings after they are freed in phpdbg | Bob Weinand | 2016-10-01 | 1 | -0/+11 |
| | | |||||
* | | Add phpdbg generator command | Bob Weinand | 2016-09-28 | 6 | -62/+242 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Julien Pauli | 2016-09-23 | 1 | -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.0 | Julien Pauli | 2016-09-23 | 1 | -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 management | Julien Pauli | 2016-09-23 | 1 | -12/+16 |
| | | | |||||
| | * | fix every work call mmap | tom916 | 2016-09-23 | 1 | -13/+12 |
| | | | | | | | | | | | | fix fpm_scoreboard_free | ||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-09-23 | 2 | -3/+44 |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-7.0: update NEWS phpdbg next command must stop when leaving function | ||||
| * | | phpdbg next command must stop when leaving function | Bob Weinand | 2016-09-23 | 2 | -3/+44 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | George Wang | 2016-09-19 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | George Wang | 2016-09-19 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Fix wrong year in previous commit. | George Wang | 2016-09-19 | 1 | -2/+2 |
| | | | |||||
| | * | backport 59444347 and 3d7343f6 | Anatol Belski | 2016-09-08 | 3 | -0/+12 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Stanislav Malyshev | 2016-09-04 | 1 | -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. Possible | David Carlier | 2016-09-04 | 1 | -2/+16 |
| | | | | | | | | | | | | overflow when copy the socket_path configuration. | ||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-09-03 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #72996 | Nikita Popov | 2016-09-03 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-08-29 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.0: fix dealloc mismatch | ||||
| * | | fix dealloc mismatch | Anatol Belski | 2016-08-29 | 1 | -1/+1 |
| | | | |||||
* | | | code cleanup. | George Wang | 2016-08-28 | 1 | -7/+0 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | George Wang | 2016-08-28 | 1 | -58/+357 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | George Wang | 2016-08-28 | 1 | -58/+357 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: sapi/litespeed/lsapi_main.c | ||||
| | * | Added .user.ini support. | George Wang | 2016-08-28 | 1 | -32/+489 |
| | | | | | | | | | | | | | | | Added LSPHPRC support. update LiteSpeed SAPI version to 6.10 . | ||||
| | * | Fix bug #72836 - integer overflow in base64_decode caused heap corruption | Stanislav Malyshev | 2016-08-16 | 2 | -0/+489 |
| | | | |||||
* | | | Fix some typos in PHP FPM configuration | Matthias Endler | 2016-08-15 | 1 | -6/+6 |
| | | | | | | | | | | | | [skip ci] | ||||
* | | | pull ps_title behind the logic to support the current codepage | Anatol Belski | 2016-08-11 | 1 | -23/+14 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-08-09 | 1 | -6/+2 |
|\ \ \ | |/ / | |||||
| * | | Don't copy mime types in CLI server | Nikita Popov | 2016-08-09 | 1 | -6/+2 |
| | | | | | | | | | | | | This is both unnecessary and causes leaks in valgrind. | ||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2016-07-28 | 1 | -1/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-07-28 | 1 | -1/+6 |
| |\ \ | | |/ | |||||
| | * | Fix #72676: Test cli_process_title_unix fails on AIX | Christoph M. Becker | 2016-07-28 | 1 | -1/+6 |
| | | | | | | | | | | | | Patch provided by matthieu dot sarter dot external at atos dot net. | ||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Remi Collet | 2016-07-22 | 2 | -3/+84 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.0: FPM: add test for CVE-2016-5385 | ||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Remi Collet | 2016-07-22 | 2 | -3/+84 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.6: FPM: add test for CVE-2016-5385 | ||||
| | * | FPM: add test for CVE-2016-5385 | Remi Collet | 2016-07-22 | 2 | -3/+84 |
| | | | |||||
* | | | add missing header to fix build | Anatol Belski | 2016-07-19 | 1 | -0/+2 |
| | | | |||||
* | | | correct macro names | Anatol Belski | 2016-07-17 | 1 | -2/+2 |
| | | | |||||
* | | | Disable optimizer when it conflicts with phpdbg tests | Bob Weinand | 2016-07-13 | 2 | -0/+4 |
| | | | |||||
* | | | Remove bogus zend_signal_shutdown symbol from header | Bob Weinand | 2016-07-13 | 1 | -7/+6 |
| | | | |||||
* | | | Cleanup zend_/signal usage in phpdbg.c | Bob Weinand | 2016-07-13 | 2 | -25/+10 |
| | | | |||||
* | | | Fix phpdbg ZTS watchpoint+shutdown sequences & opcache+watchpoints | Bob Weinand | 2016-07-12 | 2 | -156/+174 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' | Julien Pauli | 2016-07-12 | 1 | -2/+2 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | * PHP-7.0: Updated NEWS Updated NEWS Fix #72575: using --allow-to-run-as-root should ignore missing user directive |