summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_wait.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2014-10-28 22:44:29 +0100
committerBob Weinand <bobwei9@hotmail.com>2014-10-28 22:44:29 +0100
commitbe5d38976807c0e16c04fc53192ddab89d946a90 (patch)
treef67ab4820a54e8f9817f7f6e92be71c460f4cea0 /sapi/phpdbg/phpdbg_wait.c
parent6150d9342c877192af3b3ba5da677accdfa69259 (diff)
parent234df7d2cae516cba99619267be2f9db7a1418a7 (diff)
downloadphp-git-be5d38976807c0e16c04fc53192ddab89d946a90.tar.gz
Merge phpdbg into PHP-5.6
Diffstat (limited to 'sapi/phpdbg/phpdbg_wait.c')
-rw-r--r--sapi/phpdbg/phpdbg_wait.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c
index bdce77180b..a8c7dd49cb 100644
--- a/sapi/phpdbg/phpdbg_wait.c
+++ b/sapi/phpdbg/phpdbg_wait.c
@@ -174,6 +174,7 @@ void phpdbg_webdata_decompress(char *msg, int len TSRMLS_DC) {
free_zv = *zvpp;
}
+#if PHP_VERSION_ID >= 50600
if (zend_hash_find(ht, "input", sizeof("input"), (void **) &zvpp) == SUCCESS && Z_TYPE_PP(zvpp) == IS_STRING) {
if (SG(request_info).request_body) {
php_stream_close(SG(request_info).request_body);
@@ -182,6 +183,7 @@ void phpdbg_webdata_decompress(char *msg, int len TSRMLS_DC) {
php_stream_truncate_set_size(SG(request_info).request_body, 0);
php_stream_write(SG(request_info).request_body, Z_STRVAL_PP(zvpp), Z_STRLEN_PP(zvpp));
}
+#endif
if (zend_hash_find(ht, "cwd", sizeof("cwd"), (void **) &zvpp) == SUCCESS && Z_TYPE_PP(zvpp) == IS_STRING) {
if (VCWD_CHDIR(Z_STRVAL_PP(zvpp)) == SUCCESS) {