projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
5adb632
)
* fix PHP4 build
author
Michael Wallner
<mike@php.net>
Wed, 9 Feb 2005 16:59:22 +0000
(16:59 +0000)
committer
Michael Wallner
<mike@php.net>
Wed, 9 Feb 2005 16:59:22 +0000
(16:59 +0000)
http_build_query.c
patch
|
blob
|
history
diff --git
a/http_build_query.c
b/http_build_query.c
index 689204cca6c706b6b83fcdf3bf133316fbb880a5..a97d3431332326b81516fad7ae907f7f9011f3c2 100644
(file)
--- a/
http_build_query.c
+++ b/
http_build_query.c
@@
-60,6
+60,7
@@
PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
key_len -= 1;
}
key_len -= 1;
}
+#ifdef ZEND_ENGINE_2
/* handling for private & protected object properties */
if (key && *key == '\0' && type != NULL) {
char *tmp;
/* handling for private & protected object properties */
if (key && *key == '\0' && type != NULL) {
char *tmp;
@@
-72,6
+73,7
@@
PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
zend_unmangle_property_name(key, &tmp, &key);
key_len = strlen(key);
}
zend_unmangle_property_name(key, &tmp, &key);
key_len = strlen(key);
}
+#endif
if (zend_hash_get_current_data_ex(ht, (void **)&zdata, NULL) == FAILURE || !zdata || !(*zdata)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array.");
if (zend_hash_get_current_data_ex(ht, (void **)&zdata, NULL) == FAILURE || !zdata || !(*zdata)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array.");
@@
-127,8
+129,7
@@
PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
*p = '\0';
}
ht->nApplyCount++;
*p = '\0';
}
ht->nApplyCount++;
- php_url_encode_hash_ex(HASH_OF(*zdata), formstr, NULL, 0, newprefix, newprefix_len, "]", 1,
-(Z_TYPE_PP(zdata) == IS_OBJECT ? *zdata : NULL) TSRMLS_CC);
+ php_url_encode_hash_ex(HASH_OF(*zdata), formstr, NULL, 0, newprefix, newprefix_len, "]", 1, (Z_TYPE_PP(zdata) == IS_OBJECT ? *zdata : NULL) TSRMLS_CC);
ht->nApplyCount--;
efree(newprefix);
} else if (Z_TYPE_PP(zdata) == IS_NULL || Z_TYPE_PP(zdata) == IS_RESOURCE) {
ht->nApplyCount--;
efree(newprefix);
} else if (Z_TYPE_PP(zdata) == IS_NULL || Z_TYPE_PP(zdata) == IS_RESOURCE) {