Fix versions & config.m4

diff --git a/config.m4 b/config.m4
index 9603be105cf88d95bbff9875cc127cff160a54cd..87d38ea8c518f91f018a15a285c5f015b879616b 100644 (file)
--- 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 bdce77180b49d434e41485e04f10ac89615070d8..a8c7dd49cb2705ffd632ac2eaccf3cfd0d841a64 100644 (file)
--- 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 1cbc4107b5cb1158047a60bae5efc2082797890c..7c169ee11397f626e8cedc496e5041d1ad2c75b9 100644 (file)
--- 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 */
        {