projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- path has been copied twice
[m6w6/ext-http]
/
http_request_object.c
diff --git
a/http_request_object.c
b/http_request_object.c
index 8d6e798ebefc95e2a4ac2089c380df375a3142a4..facd8e974e5fbd27f02efac7f9559adc38fb02f6 100644
(file)
--- a/
http_request_object.c
+++ b/
http_request_object.c
@@
-348,7
+348,7
@@
static inline void _http_request_object_declare_default_properties(TSRMLS_D)
DCL_PROP_N(PROTECTED, options);
DCL_PROP_N(PROTECTED, responseInfo);
DCL_PROP_N(PROTECTED, responseData);
DCL_PROP_N(PROTECTED, options);
DCL_PROP_N(PROTECTED, responseInfo);
DCL_PROP_N(PROTECTED, responseData);
- DCL_PROP
_N(PROTECTED, responseCode
);
+ DCL_PROP
(PROTECTED, long, responseCode, 0
);
DCL_PROP_N(PROTECTED, responseMessage);
DCL_PROP_N(PROTECTED, postFields);
DCL_PROP_N(PROTECTED, postFiles);
DCL_PROP_N(PROTECTED, responseMessage);
DCL_PROP_N(PROTECTED, postFields);
DCL_PROP_N(PROTECTED, postFiles);
@@
-431,14
+431,8
@@
STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
HTTP_CHECK_CURL_INIT(obj->request->ch, curl_easy_init(), return FAILURE);
URL = convert_to_type_ex(IS_STRING, GET_PROP(obj, url), &URL_p);
HTTP_CHECK_CURL_INIT(obj->request->ch, curl_easy_init(), return FAILURE);
URL = convert_to_type_ex(IS_STRING, GET_PROP(obj, url), &URL_p);
- obj->request->url = http_absolute_uri_ex(Z_STRVAL_P(URL), Z_STRLEN_P(URL), NULL, 0, NULL, 0, 0);
- if (URL_p) {
- zval_ptr_dtor(&URL_p);
- }
-
- if (!obj->request->url) {
- return FAILURE;
- }
+ obj->request->url = http_absolute_url(Z_STRVAL_P(URL));
+ if (URL_p) zval_ptr_dtor(&URL_p);
switch (obj->request->meth = Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_PROP(obj, method), &meth_p)))
{
switch (obj->request->meth = Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_PROP(obj, method), &meth_p)))
{
@@
-532,11
+526,11
@@
STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
if (Z_STRLEN_P(qdata)) {
if (!strchr(obj->request->url, '?')) {
if (Z_STRLEN_P(qdata)) {
if (!strchr(obj->request->url, '?')) {
- strlcat(obj->request->url, "?", HTTP_UR
I
_MAXLEN);
+ strlcat(obj->request->url, "?", HTTP_UR
L
_MAXLEN);
} else {
} else {
- strlcat(obj->request->url, "&", HTTP_UR
I
_MAXLEN);
+ strlcat(obj->request->url, "&", HTTP_UR
L
_MAXLEN);
}
}
- strlcat(obj->request->url, Z_STRVAL_P(qdata), HTTP_UR
I
_MAXLEN);
+ strlcat(obj->request->url, Z_STRVAL_P(qdata), HTTP_UR
L
_MAXLEN);
}
http_request_prepare(obj->request, Z_ARRVAL_P(options));
}
http_request_prepare(obj->request, Z_ARRVAL_P(options));
@@
-601,7
+595,7
@@
STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
UPD_PROP(obj, long, responseCode, msg->http.info.response.code);
UPD_PROP(obj, long, responseCode, msg->http.info.response.code);
- MAKE_STD_ZVAL(headers)
+ MAKE_STD_ZVAL(headers)
;
array_init(headers);
zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
array_init(headers);
zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));