diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-22 11:59:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-22 11:59:53 +0800 |
| commit | 89d89b95861c4366f93e705546c0ca8c4443a425 (patch) | |
| tree | d59aaef97b53a61bc7c10de368dad7adcc34fef7 /ext/standard/http.c | |
| parent | e48b9ad197b4ec6ac72e75538453cc350d0a41f4 (diff) | |
| parent | fa588a5c82c0264dc10862495c993a914a421667 (diff) | |
| download | php-git-89d89b95861c4366f93e705546c0ca8c4443a425.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'ext/standard/http.c')
| -rw-r--r-- | ext/standard/http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/http.c b/ext/standard/http.c index b839a4cb97..14d73779a4 100644 --- a/ext/standard/http.c +++ b/ext/standard/http.c @@ -41,7 +41,7 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, return FAILURE; } - if (ht->nApplyCount > 0) { + if (ht->u.v.nApplyCount > 0) { /* Prevent recursion */ return SUCCESS; } @@ -134,9 +134,9 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, *(p++) = 'B'; *p = '\0'; } - ht->nApplyCount++; + ht->u.v.nApplyCount++; php_url_encode_hash_ex(HASH_OF(zdata), formstr, NULL, 0, newprefix, newprefix_len, "%5D", 3, (Z_TYPE_P(zdata) == IS_OBJECT ? zdata : NULL), arg_sep, enc_type TSRMLS_CC); - ht->nApplyCount--; + ht->u.v.nApplyCount--; efree(newprefix); } else if (Z_TYPE_P(zdata) == IS_NULL || Z_TYPE_P(zdata) == IS_RESOURCE) { /* Skip these types */ |