63166412a2
Merge branch 'pull-request/2097'
2016-10-17 16:02:51 +01:00
f8c2089651
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-16 15:46:33 +02:00
d82da7de3a
Fixed bug #71234 (INI files are loaded even invoked as phpdbg -n --version)
2016-10-16 15:41:37 +02:00
47bd3d982e
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-16 13:48:13 +02:00
e93eaee164
Fixed bug #70776 (Simple SIGINT does not have any effect)
2016-10-16 13:47:49 +02:00
601ab6e9d0
Fix searching for catch blocks
...
Since PHP-7.1 catch blocks are addressed with relative byte difference between two catch blocks as opposed to absolute opcode number
2016-10-16 12:34:10 +02:00
386aff451b
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-14 12:25:16 +02:00
466870e2b0
Fix memory leak when compiling files in phpdbg
2016-10-14 12:24:28 +02:00
990e2ce2a0
Ignore non-executable opcodes in line mode of phpdbg_end_oplog()
...
(cherry picked from commit d14498a475
2016-10-14 02:03:46 +02:00
5ce2230266
use already exported symbol
...
(cherry picked from commit ce3e792c2c
2016-10-14 02:01:22 +02:00
f40c03168e
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
...
(cherry picked from commit 457e686262
2016-10-14 01:54:18 +02:00
6baaccc9b6
Merge branch 'PHP-7.0' into PHP-7.1
...
(cherry picked from commit 9669ec707a
2016-10-14 01:53:25 +02:00
06df34072e
Fix accidental PHPDBG_ABI break
...
(cherry picked from commit 671d8054f8
2016-10-14 01:50:48 +02:00
11e7447e04
Merge branch 'PHP-7.0' into PHP-7.1
...
(cherry picked from commit 37ae5f3931
2016-10-14 01:48:03 +02:00
d14498a475
Ignore non-executable opcodes in line mode of phpdbg_end_oplog()
2016-10-13 14:09:56 +02:00
ce3e792c2c
use already exported symbol
2016-10-13 09:55:37 +02:00
fe49fd7dad
Update NEWS
...
Also add missing include.inc test file
2016-10-12 22:54:32 +02:00
fe378c27cc
Fix phpdbg tests after lineno change
2016-10-12 22:41:59 +02:00
671d8054f8
Fix accidental PHPDBG_ABI break
2016-10-12 22:16:11 +02:00
5aae01104f
Add stdin command and -s command line parameter to phpdbg
...
This allows reading the initial script file from stdin instead of being forced to put the script into a file in order to run it with phpdbg.
Especially important for programmatic execution of phpdbg.
Also adding tests/include_once.phpt and tests/set_exception_handler.phpt as I seem to have forgotten to git add them sometime long ago...
2016-10-12 20:15:49 +02:00
c9d3b9fb47
Use better fix for preventing too early freeing of interned strings
...
Works also with opcache now - just prevent zend_interned_strings_restore completely - zend_interned_strings_dtor will take care as phpdbg only ever uses one single request cycle per module cycle
2016-10-06 10:36:25 +02:00
abfd811ea4
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-05 12:20:06 +02:00
4790da5475
Update run command for allowing STDIN
2016-10-05 12:14:02 +02:00
eaff72f31b
Remove phpdbg fix targeting 7.1 which landed in 7.0
2016-10-05 12:08:20 +02:00
8fcc938e56
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-03 12:55:23 +02:00
8908df690f
Fix crash on Linux due to double fclose()
2016-10-03 12:55:06 +02:00
f58cf8b24d
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-02 12:46:22 +01:00
417a8ef6b4
Fix run command args passing when inmidst execution
2016-10-02 12:45:20 +01:00
3fe1010cee
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-01 19:14:26 +01:00
9d537951c5
Add proper escape sequences and reading stdin from file in phpdbg run command
2016-10-01 19:05:19 +01:00
a5129bcb5b
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-01 10:47:31 +01:00
3280a29ee5
Fix invalid access to interned strings after they are freed in phpdbg
2016-10-01 10:46:21 +01:00
e5d75d7268
Add phpdbg generator command
2016-09-28 13:26:08 +02:00
974ba6be7a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap
Conflicts:
sapi/fpm/fpm/fpm_scoreboard.c
2016-09-23 13:54:22 +02:00
fbf87a8082
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap
2016-09-23 13:53:22 +02:00
a22175b06f
Formatting. Fix possible memory corruption in FPM SHM management
2016-09-23 13:52:58 +02:00
807004a446
fix every work call mmap
...
fix fpm_scoreboard_free
2016-09-23 13:52:58 +02:00
8f256bebef
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update NEWS
phpdbg next command must stop when leaving function
2016-09-23 11:25:33 +02:00
cf35dae6e2
phpdbg next command must stop when leaving function
2016-09-23 03:29:37 +02:00
248ef30abe
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-19 10:50:21 -04:00
ca24c58e65
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-19 10:49:26 -04:00
56fa36b0a8
Fix wrong year in previous commit.
2016-09-19 10:46:46 -04:00
b1f33db39f
backport 59444347 and 3d7343f6
2016-09-08 17:46:53 +02:00
8c16f2262f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
2016-09-04 23:24:31 -07:00
19350b6b73
phpdbg: couple of network function return checks. Possible
...
overflow when copy the socket_path configuration.
2016-09-04 23:18:51 -07:00
f1bfd7fe00
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-03 23:31:05 +02:00
1ae2d074f8
Fix bug #72996
2016-09-03 23:30:23 +02:00
0e709fe42d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix dealloc mismatch
2016-08-29 13:43:08 +02:00
eac7f4b670
fix dealloc mismatch
2016-08-29 12:46:23 +02:00
0a09eecfcc
code cleanup.
2016-08-28 22:31:08 -04:00
Joe Watkins