Merge phpdbg into PHP-5.6

diff --cc sapi/phpdbg/config.m4
Simple merge

diff --cc sapi/phpdbg/config.w32
Simple merge

diff --cc sapi/phpdbg/phpdbg.c
Simple merge

diff --cc sapi/phpdbg/phpdbg.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_bp.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_bp.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_break.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_cmd.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_cmd.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_eol.c
index 0000000000000000000000000000000000000000,fc20d567bc6f7cda9c5c1880ed80a764314c4347..fc20d567bc6f7cda9c5c1880ed80a764314c4347
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_eol.c
+++ b/sapi/phpdbg/phpdbg_eol.c

diff --cc sapi/phpdbg/phpdbg_eol.h
index 0000000000000000000000000000000000000000,68b54cbe34396ec5119581e82c6465cf19db9f6a..68b54cbe34396ec5119581e82c6465cf19db9f6a
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_eol.h
+++ b/sapi/phpdbg/phpdbg_eol.h

diff --cc sapi/phpdbg/phpdbg_frame.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_help.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_help.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_info.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_info.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_io.c
index 0000000000000000000000000000000000000000,97f0356285c5fb81df56a4e99d02072e3196baf3..97f0356285c5fb81df56a4e99d02072e3196baf3
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_io.c
+++ b/sapi/phpdbg/phpdbg_io.c

diff --cc sapi/phpdbg/phpdbg_io.h
index 0000000000000000000000000000000000000000,3ac8f4112d0dbbed8ce591802740c86387167a64..3ac8f4112d0dbbed8ce591802740c86387167a64
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_io.h
+++ b/sapi/phpdbg/phpdbg_io.h

diff --cc sapi/phpdbg/phpdbg_lexer.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_lexer.l
Simple merge

diff --cc sapi/phpdbg/phpdbg_list.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_list.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_opcode.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_out.c
index 0000000000000000000000000000000000000000,a4793f144f63e3a53017a0e9a88bbc9bfad255fc..a4793f144f63e3a53017a0e9a88bbc9bfad255fc
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_out.c
+++ b/sapi/phpdbg/phpdbg_out.c

diff --cc sapi/phpdbg/phpdbg_out.h
index 0000000000000000000000000000000000000000,ea25b04279d73f0ad99988b2f80a0cb1444d41d4..ea25b04279d73f0ad99988b2f80a0cb1444d41d4
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_out.h
+++ b/sapi/phpdbg/phpdbg_out.h

diff --cc sapi/phpdbg/phpdbg_parser.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_parser.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_parser.y
Simple merge

diff --cc sapi/phpdbg/phpdbg_print.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_prompt.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_prompt.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_rinit_hook.c
index 0000000000000000000000000000000000000000,049a782d9dcd0ddf56d5b97f54fd090645113999..049a782d9dcd0ddf56d5b97f54fd090645113999
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_rinit_hook.c
+++ b/sapi/phpdbg/phpdbg_rinit_hook.c

diff --cc sapi/phpdbg/phpdbg_rinit_hook.h
index 0000000000000000000000000000000000000000,d28be10f8c4952010a6746887affa71358882507..d28be10f8c4952010a6746887affa71358882507
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_rinit_hook.h
+++ b/sapi/phpdbg/phpdbg_rinit_hook.h

diff --cc sapi/phpdbg/phpdbg_set.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_sigio_win32.c
index 0000000000000000000000000000000000000000,24e9ac0e0aacdceacd0b9577ca1e99c2f59dc880..24e9ac0e0aacdceacd0b9577ca1e99c2f59dc880
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_sigio_win32.c
+++ b/sapi/phpdbg/phpdbg_sigio_win32.c

diff --cc sapi/phpdbg/phpdbg_sigio_win32.h
index 0000000000000000000000000000000000000000,796b477f936a9e4a959fa042626dfafe0366601a..796b477f936a9e4a959fa042626dfafe0366601a
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_sigio_win32.h
+++ b/sapi/phpdbg/phpdbg_sigio_win32.h

diff --cc sapi/phpdbg/phpdbg_sigsafe.c
index 0000000000000000000000000000000000000000,7238ad102fb34408ca37e0581170de6067f61d2b..7238ad102fb34408ca37e0581170de6067f61d2b
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_sigsafe.c
+++ b/sapi/phpdbg/phpdbg_sigsafe.c

diff --cc sapi/phpdbg/phpdbg_sigsafe.h
index 0000000000000000000000000000000000000000,6ed74f53db9178d7fbcd1e19b8030d49e2817cfd..6ed74f53db9178d7fbcd1e19b8030d49e2817cfd
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_sigsafe.h
+++ b/sapi/phpdbg/phpdbg_sigsafe.h

diff --cc sapi/phpdbg/phpdbg_utils.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_utils.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_wait.c
index 0000000000000000000000000000000000000000,ea506a2d932f76172df212d7bab4bdaac5e9123e..ea506a2d932f76172df212d7bab4bdaac5e9123e
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_wait.c
+++ b/sapi/phpdbg/phpdbg_wait.c

diff --cc sapi/phpdbg/phpdbg_wait.h
index 0000000000000000000000000000000000000000,7cf95919ccb869170ad9ee09f3a22f92286a8bc9..7cf95919ccb869170ad9ee09f3a22f92286a8bc9
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_wait.h
+++ b/sapi/phpdbg/phpdbg_wait.h

diff --cc sapi/phpdbg/phpdbg_watch.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_watch.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_webdata_transfer.c
index 0000000000000000000000000000000000000000,e7438ea01abf495e075a908098feb19730fd98d3..e7438ea01abf495e075a908098feb19730fd98d3
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_webdata_transfer.c
+++ b/sapi/phpdbg/phpdbg_webdata_transfer.c

diff --cc sapi/phpdbg/phpdbg_webdata_transfer.h
index 0000000000000000000000000000000000000000,d70175ad99d8550318da28ce996a5d943edb9732..d70175ad99d8550318da28ce996a5d943edb9732
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_webdata_transfer.h
+++ b/sapi/phpdbg/phpdbg_webdata_transfer.h

diff --cc sapi/phpdbg/tests/commands/0002_set.test
Simple merge

diff --cc sapi/phpdbg/tests/commands/0102_print.test
Simple merge

diff --cc sapi/phpdbg/tests/commands/0104_clean.test
Simple merge

diff --cc sapi/phpdbg/tests/commands/0105_clear.test
Simple merge

diff --cc sapi/phpdbg/tests/commands/0106_compile.test
Simple merge

diff --cc sapi/phpdbg/xml.md
index 0000000000000000000000000000000000000000,0556fb2415296fad7cd745689e088d62cdc976dc..0556fb2415296fad7cd745689e088d62cdc976dc
mode 000000,100644..100644
--- /dev/null
--- 2/xml.md
+++ b/sapi/phpdbg/xml.md

diff --cc sapi/phpdbg/zend_mm_structs.h
index 0000000000000000000000000000000000000000,ca64069e0f89928f045e31a8e963bd6b98af417b..ca64069e0f89928f045e31a8e963bd6b98af417b
mode 000000,100644..100644
--- /dev/null
--- 2/zend_mm_structs.h
+++ b/sapi/phpdbg/zend_mm_structs.h