diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /sapi/phpdbg/phpdbg_webdata_transfer.c | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'sapi/phpdbg/phpdbg_webdata_transfer.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_webdata_transfer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sapi/phpdbg/phpdbg_webdata_transfer.c b/sapi/phpdbg/phpdbg_webdata_transfer.c index 5ce6759062..258c8cf09f 100644 --- a/sapi/phpdbg/phpdbg_webdata_transfer.c +++ b/sapi/phpdbg/phpdbg_webdata_transfer.c @@ -19,15 +19,15 @@ #include "phpdbg_webdata_transfer.h" #include "ext/standard/php_var.h" -static int phpdbg_is_auto_global(char *name, int len TSRMLS_DC) { +static int phpdbg_is_auto_global(char *name, int len) { int ret; zend_string *str = zend_string_init(name, len, 0); - ret = zend_is_auto_global(str TSRMLS_CC); + ret = zend_is_auto_global(str); efree(str); return ret; } -PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len TSRMLS_DC) { +PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len) { zval array; HashTable *ht; zval zv[9] = {{{0}}}; @@ -37,11 +37,11 @@ PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len TSRMLS_DC) { /* fetch superglobals */ { - phpdbg_is_auto_global(ZEND_STRL("GLOBALS") TSRMLS_CC); + phpdbg_is_auto_global(ZEND_STRL("GLOBALS")); /* might be JIT */ - phpdbg_is_auto_global(ZEND_STRL("_ENV") TSRMLS_CC); - phpdbg_is_auto_global(ZEND_STRL("_SERVER") TSRMLS_CC); - phpdbg_is_auto_global(ZEND_STRL("_REQUEST") TSRMLS_CC); + phpdbg_is_auto_global(ZEND_STRL("_ENV")); + phpdbg_is_auto_global(ZEND_STRL("_SERVER")); + phpdbg_is_auto_global(ZEND_STRL("_REQUEST")); array_init(&zv[1]); zend_hash_copy(Z_ARRVAL(zv[1]), &EG(symbol_table).ht, NULL); Z_ARRVAL(zv[1])->pDestructor = NULL; /* we're operating on a copy! Don't double free zvals */ @@ -165,7 +165,7 @@ PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len TSRMLS_DC) { smart_str buf = {0}; PHP_VAR_SERIALIZE_INIT(var_hash); - php_var_serialize(&buf, &array, &var_hash TSRMLS_CC); + php_var_serialize(&buf, &array, &var_hash); PHP_VAR_SERIALIZE_DESTROY(var_hash); *msg = buf.s->val; *len = buf.s->len; |