com php-src: Merge phpdbg into PHP-5.6: config.m4 phpdbg_wait .c phpdbg_webdata_transfer.c
| From: | Bob Weinand | Date: | Tue, 28 Oct 2014 21:44:29 +0000 |
| Subject: | com php-src: Merge phpdbg into PHP-5.6: config.m4 phpdbg_wait .c phpdbg_webdata_transfer.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82839@lists.php.net to get a copy of this message | ||
Commit: 45e2dc692b9b0ad13c32444622d85c0353aaee42
Author: Bob Weinand <bobwei9@hotmail.com> Tue, 28 Oct 2014 22:44:29 +0100
Parents: 4bc7a91be71f833672cc52134e665ce0b08bd61c
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=45e2dc692b9b0ad13c32444622d85c0353aaee42
Log:
Merge phpdbg into PHP-5.6
Changed paths:
M config.m4
M phpdbg_wait.c
M phpdbg_webdata_transfer.c
Diff:
diff --git a/config.m4 b/config.m4
index 9603be1..87d38ea 100644
--- a/config.m4
+++ b/config.m4
@@ -25,6 +25,7 @@ if test "$BUILD_PHPDBG" == "" && test
"$PHP_PHPDBG" != "no"; then
if ! test -d $abs_srcdir/ext/phpdbg_webhelper; then
ln -s ../sapi/phpdbg $abs_srcdir/ext/phpdbg_webhelper
fi
+ PHP_NEW_EXTENSION(phpdbg_webhelper, phpdbg_rinit_hook.c phpdbg_webdata_transfer.c, $ext_shared)
fi
PHP_PHPDBG_CFLAGS="-D_GNU_SOURCE"
diff --git a/phpdbg_wait.c b/phpdbg_wait.c
index bdce771..a8c7dd4 100644
--- a/phpdbg_wait.c
+++ b/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) {
diff --git a/phpdbg_webdata_transfer.c b/phpdbg_webdata_transfer.c
index 1cbc410..7c169ee 100644
--- a/phpdbg_webdata_transfer.c
+++ b/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 */
{