From: Bob Weinand <bobwei9@hotmail.com>
Date: Fri, 24 Oct 2014 17:22:45 +0000 (+0200)
Subject: Merge phpdbg into PHP-5.6
X-Git-Tag: php-5.6.3RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b4d9ac6c7fbc6a53aee6c9b199046556e5fef13;p=php

Merge phpdbg into PHP-5.6
---

9b4d9ac6c7fbc6a53aee6c9b199046556e5fef13
diff --cc sapi/phpdbg/phpdbg_eol.c
index 0000000000,fc20d567bc..fc20d567bc
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_eol.c
+++ b/sapi/phpdbg/phpdbg_eol.c
diff --cc sapi/phpdbg/phpdbg_eol.h
index 0000000000,68b54cbe34..68b54cbe34
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_eol.h
+++ b/sapi/phpdbg/phpdbg_eol.h
diff --cc sapi/phpdbg/phpdbg_io.c
index 0000000000,97f0356285..97f0356285
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_io.c
+++ b/sapi/phpdbg/phpdbg_io.c
diff --cc sapi/phpdbg/phpdbg_io.h
index 0000000000,3ac8f4112d..3ac8f4112d
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_io.h
+++ b/sapi/phpdbg/phpdbg_io.h
diff --cc sapi/phpdbg/phpdbg_out.c
index 0000000000,a4793f144f..a4793f144f
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_out.c
+++ b/sapi/phpdbg/phpdbg_out.c
diff --cc sapi/phpdbg/phpdbg_out.h
index 0000000000,ea25b04279..ea25b04279
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_out.h
+++ b/sapi/phpdbg/phpdbg_out.h
diff --cc sapi/phpdbg/phpdbg_rinit_hook.c
index 0000000000,049a782d9d..049a782d9d
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_rinit_hook.c
+++ b/sapi/phpdbg/phpdbg_rinit_hook.c
diff --cc sapi/phpdbg/phpdbg_rinit_hook.h
index 0000000000,d28be10f8c..d28be10f8c
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_rinit_hook.h
+++ b/sapi/phpdbg/phpdbg_rinit_hook.h
diff --cc sapi/phpdbg/phpdbg_sigio_win32.c
index 0000000000,24e9ac0e0a..24e9ac0e0a
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_sigio_win32.c
+++ b/sapi/phpdbg/phpdbg_sigio_win32.c
diff --cc sapi/phpdbg/phpdbg_sigio_win32.h
index 0000000000,796b477f93..796b477f93
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_sigio_win32.h
+++ b/sapi/phpdbg/phpdbg_sigio_win32.h
diff --cc sapi/phpdbg/phpdbg_sigsafe.c
index 0000000000,7238ad102f..7238ad102f
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_sigsafe.c
+++ b/sapi/phpdbg/phpdbg_sigsafe.c
diff --cc sapi/phpdbg/phpdbg_sigsafe.h
index 0000000000,6ed74f53db..6ed74f53db
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_sigsafe.h
+++ b/sapi/phpdbg/phpdbg_sigsafe.h
diff --cc sapi/phpdbg/phpdbg_wait.c
index 0000000000,ea506a2d93..ea506a2d93
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_wait.c
+++ b/sapi/phpdbg/phpdbg_wait.c
diff --cc sapi/phpdbg/phpdbg_wait.h
index 0000000000,7cf95919cc..7cf95919cc
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_wait.h
+++ b/sapi/phpdbg/phpdbg_wait.h
diff --cc sapi/phpdbg/phpdbg_webdata_transfer.c
index 0000000000,e7438ea01a..e7438ea01a
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_webdata_transfer.c
+++ b/sapi/phpdbg/phpdbg_webdata_transfer.c
diff --cc sapi/phpdbg/phpdbg_webdata_transfer.h
index 0000000000,d70175ad99..d70175ad99
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_webdata_transfer.h
+++ b/sapi/phpdbg/phpdbg_webdata_transfer.h
diff --cc sapi/phpdbg/xml.md
index 0000000000,0556fb2415..0556fb2415
mode 000000,100644..100644
--- a/sapi/phpdbg/xml.md
+++ b/sapi/phpdbg/xml.md
diff --cc sapi/phpdbg/zend_mm_structs.h
index 0000000000,ca64069e0f..ca64069e0f
mode 000000,100644..100644
--- a/sapi/phpdbg/zend_mm_structs.h
+++ b/sapi/phpdbg/zend_mm_structs.h