projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Backport v4 updates
[m6w6/ext-http]
/
src
/
php_http_url.c
diff --git
a/src/php_http_url.c
b/src/php_http_url.c
index 21e38e248be4d2355ba5167f5ebc9ee61d1dc712..32bae585790a2d866f7d2ccbbddce5910d626370 100644
(file)
--- a/
src/php_http_url.c
+++ b/
src/php_http_url.c
@@
-535,7
+535,7
@@
HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct)
if (!strct || Z_TYPE_P(strct) == IS_ARRAY) { \
zend_hash_str_update(ht, part, lenof(part), &tmp); \
} else { \
if (!strct || Z_TYPE_P(strct) == IS_ARRAY) { \
zend_hash_str_update(ht, part, lenof(part), &tmp); \
} else { \
- zend_update_property(Z_OBJCE_P(strct),
Z_OBJ_P(strct)
, part, lenof(part), &tmp); \
+ zend_update_property(Z_OBJCE_P(strct),
strct
, part, lenof(part), &tmp); \
zval_ptr_dtor(&tmp); \
}
zval_ptr_dtor(&tmp); \
}
@@
-1984,7
+1984,7
@@
PHP_METHOD(HttpUrl, mod)
if ((old_purl = php_http_url_from_struct(HASH_OF(getThis())))) {
php_http_url_t *res_purl;
if ((old_purl = php_http_url_from_struct(HASH_OF(getThis())))) {
php_http_url_t *res_purl;
- ZVAL_OBJ(return_value, zend_objects_clone_obj(
Z_OBJ_P(getThis()
)));
+ ZVAL_OBJ(return_value, zend_objects_clone_obj(
getThis(
)));
res_purl = php_http_url_mod(old_purl, new_purl, flags);
php_http_url_to_struct(res_purl, return_value);
res_purl = php_http_url_mod(old_purl, new_purl, flags);
php_http_url_to_struct(res_purl, return_value);
@@
-2108,4
+2108,3
@@
PHP_MINIT_FUNCTION(http_url)
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
-