projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- hopefully some more appropriate fixes for the zval separation issues
[m6w6/ext-http]
/
http_url_api.c
diff --git
a/http_url_api.c
b/http_url_api.c
index 53faf9506f5417440570c2053df5e9c139011258..7bacffc3e73e26120c8ddbc58e7f52ec1df63eb4 100644
(file)
--- a/
http_url_api.c
+++ b/
http_url_api.c
@@
-37,6
+37,8
@@
PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC)
if (purl) {
http_build_url(purl, NULL, NULL, &abs, NULL);
php_url_free(purl);
if (purl) {
http_build_url(purl, NULL, NULL, &abs, NULL);
php_url_free(purl);
+ } else {
+ http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", url);
}
return abs;
}
return abs;
@@
-297,13
+299,7
@@
PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, c
return FAILURE;
}
} else {
return FAILURE;
}
} else {
- zval *val;
-
- ALLOC_ZVAL(val);
- *val = **data;
- INIT_PZVAL(val);
- zval_copy_ctor(val);
- convert_to_string(val);
+ zval *val = zval_copy(IS_STRING, *data);
if (PHPSTR_LEN(str)) {
phpstr_append(str, arg_sep, arg_sep_len);
if (PHPSTR_LEN(str)) {
phpstr_append(str, arg_sep, arg_sep_len);
@@
-320,7
+316,7
@@
PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, c
efree(encoded_val);
}
efree(encoded_val);
}
- zval_
ptr_dtor
(&val);
+ zval_
free
(&val);
}
phpstr_dtor(&new_prefix);
}
}
phpstr_dtor(&new_prefix);
}