projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge R_2_5
[m6w6/ext-http]
/
php_http_message.c
diff --git
a/php_http_message.c
b/php_http_message.c
index f06065a4eb05ef138e5b09ed2ebb031a64da7961..e6cdbc8f143782b56784239e6ebde8e16b552477 100644
(file)
--- a/
php_http_message.c
+++ b/
php_http_message.c
@@
-1575,10
+1575,10
@@
static PHP_METHOD(HttpMessage, setRequestUrl)
url = php_http_url_from_zval(zurl, ~0);
zend_restore_error_handling(&zeh);
url = php_http_url_from_zval(zurl, ~0);
zend_restore_error_handling(&zeh);
- if (php_http_url_is_empty(url)) {
+ if (
url &&
php_http_url_is_empty(url)) {
php_http_url_free(&url);
php_http_throw(invalid_arg, "Cannot set http\\Message's request url to an empty string", NULL);
php_http_url_free(&url);
php_http_throw(invalid_arg, "Cannot set http\\Message's request url to an empty string", NULL);
- } else {
+ } else
if (url)
{
PTR_SET(obj->message->http.info.request.url, url);
}
PTR_SET(obj->message->http.info.request.url, url);
}