diff options
author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 22:44:29 +0100 |
---|---|---|
committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 22:44:29 +0100 |
commit | be5d38976807c0e16c04fc53192ddab89d946a90 (patch) | |
tree | f67ab4820a54e8f9817f7f6e92be71c460f4cea0 /sapi/phpdbg/phpdbg_webdata_transfer.c | |
parent | 6150d9342c877192af3b3ba5da677accdfa69259 (diff) | |
parent | 234df7d2cae516cba99619267be2f9db7a1418a7 (diff) | |
download | php-git-be5d38976807c0e16c04fc53192ddab89d946a90.tar.gz |
Merge phpdbg into PHP-5.6
Diffstat (limited to 'sapi/phpdbg/phpdbg_webdata_transfer.c')
-rw-r--r-- | sapi/phpdbg/phpdbg_webdata_transfer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_webdata_transfer.c b/sapi/phpdbg/phpdbg_webdata_transfer.c index 1cbc4107b5..7c169ee113 100644 --- a/sapi/phpdbg/phpdbg_webdata_transfer.c +++ b/sapi/phpdbg/phpdbg_webdata_transfer.c @@ -49,6 +49,7 @@ PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len TSRMLS_DC) { zend_hash_add(ht, "GLOBALS", sizeof("GLOBALS"), &zvp1, sizeof(zval *), NULL); } +#if PHP_VERSION_ID >= 50600 /* save php://input */ { php_stream *stream; @@ -64,6 +65,7 @@ PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len TSRMLS_DC) { Z_SET_REFCOUNT(zv2, 2); zend_hash_add(ht, "input", sizeof("input"), &zvp2, sizeof(zval *), NULL); } +#endif /* change sapi name */ { |