X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=0c68635b1a662f1af3814bdf8b1abeb4336938b9;hp=bef6e7f3ac2ce4a072e25fe303fc9c479a39bade;hb=18415c72d3b9f92b74dab623a88d5abf054c7bd0;hpb=b4b3a9ff0e9f853a7f1184d9a6d773d661f8df3d diff --git a/http_request_object.c b/http_request_object.c index bef6e7f..0c68635 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -34,11 +34,15 @@ #include "php_http_message_object.h" #include "php_http_exception_object.h" +#include "missing.h" + #ifdef PHP_WIN32 # include #endif #include +ZEND_EXTERN_MODULE_GLOBALS(http); + #define HTTP_BEGIN_ARGS(method, ret_ref, req_args) HTTP_BEGIN_ARGS_EX(HttpRequest, method, ret_ref, req_args) #define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpRequest, method, ret_ref) #define HTTP_REQUEST_ME(method, visibility) PHP_ME(HttpRequest, method, HTTP_ARGS(HttpRequest, method), visibility) @@ -144,6 +148,7 @@ HTTP_END_ARGS; HTTP_EMPTY_ARGS(getResponseMessage, 1); HTTP_EMPTY_ARGS(getRequestMessage, 1); +HTTP_EMPTY_ARGS(getHistory, 1); HTTP_EMPTY_ARGS(send, 0); HTTP_BEGIN_ARGS(get, 0, 1) @@ -202,11 +207,6 @@ HTTP_BEGIN_ARGS(methodExists, 0, 1) HTTP_ARG_VAL(method, 0) HTTP_END_ARGS; -HTTP_BEGIN_ARGS(debugWrapper, 0, 2) - HTTP_ARG_VAL(info_type, 0) - HTTP_ARG_VAL(info_message, 0) -HTTP_END_ARGS; - #define http_request_object_declare_default_properties() _http_request_object_declare_default_properties(TSRMLS_C) static inline void _http_request_object_declare_default_properties(TSRMLS_D); @@ -267,6 +267,7 @@ zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ME(getResponseInfo, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getResponseMessage, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getRequestMessage, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(getHistory, ZEND_ACC_PUBLIC) HTTP_REQUEST_ALIAS(get, http_get) HTTP_REQUEST_ALIAS(head, http_head) @@ -280,8 +281,6 @@ zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ALIAS(methodName, http_request_method_name) HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists) - HTTP_REQUEST_ME(debugWrapper, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) - {NULL, NULL, NULL} }; static zend_object_handlers http_request_object_handlers; @@ -340,6 +339,7 @@ zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC) o->ch = curl_easy_init(); o->pool = NULL; + phpstr_init(&o->history); phpstr_init(&o->request); phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0); @@ -372,7 +372,7 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D) DCL_PROP(PROTECTED, string, queryData, ""); DCL_PROP(PROTECTED, string, putFile, ""); - DCL_PROP_N(PRIVATE, dbg_user_cb); + DCL_PROP(PUBLIC, bool, recordHistory, 1); } void _http_request_object_free(zend_object *object TSRMLS_DC) @@ -386,11 +386,14 @@ void _http_request_object_free(zend_object *object TSRMLS_DC) if (o->ch) { /* avoid nasty segfaults with already cleaned up callbacks */ curl_easy_setopt(o->ch, CURLOPT_NOPROGRESS, 1); + curl_easy_setopt(o->ch, CURLOPT_PROGRESSFUNCTION, NULL); curl_easy_setopt(o->ch, CURLOPT_VERBOSE, 0); + curl_easy_setopt(o->ch, CURLOPT_DEBUGFUNCTION, NULL); curl_easy_cleanup(o->ch); } phpstr_dtor(&o->response); phpstr_dtor(&o->request); + phpstr_dtor(&o->history); efree(o); } @@ -404,7 +407,7 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ return FAILURE; } if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) { - http_error(E_WARNING, HTTP_E_CURL, "Could not initilaize curl"); + http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initilaize curl"); return FAILURE; } @@ -427,22 +430,12 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri)); } - /* ensure we have HttpRequest::debugWrapper as dbg callback */ - { - zval *dbg_cb; - MAKE_STD_ZVAL(dbg_cb); - array_init(dbg_cb); - add_next_index_zval(dbg_cb, getThis()); - add_next_index_stringl(dbg_cb, "debugWrapper", lenof("debugWrapper"), 1); - add_assoc_zval(opts, "ondebug", dbg_cb); - } - switch (Z_LVAL_P(meth)) { case HTTP_GET: case HTTP_HEAD: body->type = -1; - status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, NULL, Z_ARRVAL_P(opts), &obj->response); + status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, NULL, Z_ARRVAL_P(opts)); break; case HTTP_PUT: @@ -457,7 +450,7 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ body->data = stream; body->size = ssb.sb.st_size; - status = http_request_init(obj->ch, HTTP_PUT, request_uri, body, Z_ARRVAL_P(opts), &obj->response); + status = http_request_init(obj->ch, HTTP_PUT, request_uri, body, Z_ARRVAL_P(opts)); } else { status = FAILURE; } @@ -469,7 +462,7 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ zval *fields = GET_PROP(obj, postFields), *files = GET_PROP(obj, postFiles); if (SUCCESS == (status = http_request_body_fill(body, Z_ARRVAL_P(fields), Z_ARRVAL_P(files)))) { - status = http_request_init(obj->ch, HTTP_POST, request_uri, body, Z_ARRVAL_P(opts), &obj->response); + status = http_request_init(obj->ch, HTTP_POST, request_uri, body, Z_ARRVAL_P(opts)); } } break; @@ -482,7 +475,7 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ body->data = Z_STRVAL_P(post); body->size = Z_STRLEN_P(post); - status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, body, Z_ARRVAL_P(opts), &obj->response); + status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, body, Z_ARRVAL_P(opts)); } break; } @@ -506,7 +499,40 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this if (msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response))) { char *body; size_t body_len; - zval *headers, *message, *resp = GET_PROP(obj, responseData), *info = GET_PROP(obj, responseInfo); + zval *headers, *message, + *resp = GET_PROP(obj, responseData), + *info = GET_PROP(obj, responseInfo), + *hist = GET_PROP(obj, recordHistory); + + /* should we record history? */ + if (Z_TYPE_P(hist) != IS_BOOL) { + convert_to_boolean_ex(&hist); + } + if (Z_LVAL_P(hist)) { + /* we need to act like a zipper, as we'll receive + * the requests and the responses in separate chains + * for redirects + */ + http_message *response = msg, *request = http_message_parse(PHPSTR_VAL(&obj->request), PHPSTR_LEN(&obj->request)); + http_message *free_msg = request; + + do { + char *message; + size_t msglen; + + http_message_tostring(response, &message, &msglen); + phpstr_append(&obj->history, message, msglen); + efree(message); + + http_message_tostring(request, &message, &msglen); + phpstr_append(&obj->history, message, msglen); + efree(message); + + } while ((response = response->parent) && (request = request->parent)); + + http_message_free(free_msg); + phpstr_fix(&obj->history); + } UPD_PROP(obj, long, responseCode, msg->info.response.code); @@ -602,27 +628,44 @@ PHP_METHOD(HttpRequest, setOptions) old_opts = GET_PROP(obj, options); - /* headers and cookies need extra attention -- thus cannot use array_merge() directly */ + /* some options need extra attention -- thus cannot use array_merge() directly */ FOREACH_KEYVAL(opts, key, idx, opt) { if (key) { if (!strcmp(key, "headers")) { zval **headers; if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "headers", sizeof("headers"), (void **) &headers)) { array_merge(*opt, *headers); + continue; } } else if (!strcmp(key, "cookies")) { zval **cookies; if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "cookies", sizeof("cookies"), (void **) &cookies)) { array_merge(*opt, *cookies); + continue; } - } else { - if (!strcmp(key, "ondebug")) { - SET_PROP(obj, dbg_user_cb, *opt); + } else if (!strcmp(key, "ssl")) { + zval **ssl; + if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl)) { + array_merge(*opt, *ssl); + continue; + } + }else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) { + if (Z_TYPE_PP(opt) != IS_STRING) { + convert_to_string_ex(opt); } - zval_add_ref(opt); - add_assoc_zval(old_opts, key, *opt); + UPD_PROP(obj, string, url, Z_STRVAL_PP(opt)); + continue; + } else if (!strcmp(key, "method")) { + if (Z_TYPE_PP(opt) != IS_LONG) { + convert_to_long_ex(opt); + } + UPD_PROP(obj, long, method, Z_LVAL_PP(opt)); + continue; } + zval_add_ref(opt); + add_assoc_zval(old_opts, key, *opt); + /* reset */ key = NULL; } @@ -663,7 +706,6 @@ PHP_METHOD(HttpRequest, unsetOptions) FREE_PARR(obj, options); INIT_PARR(obj, options); - zend_update_property_null(http_request_object_ce, getThis(), "dbg_user_cb", lenof("dbg_user_cb") TSRMLS_CC); } /* }}} */ @@ -951,7 +993,7 @@ PHP_METHOD(HttpRequest, setContentType) } if (!strchr(ctype, '/')) { - http_error_ex(E_WARNING, HTTP_E_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", ctype); + http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", ctype); RETURN_FALSE; } @@ -1168,7 +1210,7 @@ PHP_METHOD(HttpRequest, addPostFile) if (type_len) { if (!strchr(type, '/')) { - http_error_ex(E_WARNING, HTTP_E_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", type); + http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", type); RETURN_FALSE; } } else { @@ -1507,7 +1549,7 @@ PHP_METHOD(HttpRequest, getResponseInfo) if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), pretty_key(info_name, info_len, 0, 0), info_len + 1, (void **) &infop)) { RETURN_ZVAL(*infop, 1, ZVAL_PTR_DTOR); } else { - http_error_ex(E_NOTICE, HTTP_E_PARAM, "Could not find response info named %s", info_name); + http_error_ex(HE_NOTICE, HTTP_E_INVALID_PARAM, "Could not find response info named %s", info_name); RETURN_FALSE; } } else { @@ -1551,7 +1593,6 @@ PHP_METHOD(HttpRequest, getRequestMessage) NO_ARGS; IF_RETVAL_USED { - zval *message; http_message *msg; getObject(http_request_object, obj); @@ -1564,6 +1605,22 @@ PHP_METHOD(HttpRequest, getRequestMessage) } /* }}} */ +PHP_METHOD(HttpRequest, getHistory) +{ + NO_ARGS; + + IF_RETVAL_USED { + http_message *msg; + getObject(http_request_object, obj); + + SET_EH_THROW_HTTP(); + if (msg = http_message_parse(PHPSTR_VAL(&obj->history), PHPSTR_LEN(&obj->history))) { + RETVAL_OBJVAL(http_message_object_from_msg(msg)); + } + SET_EH_NORMAL(); + } +} + /* {{{ proto bool HttpRequest::send() * * Send the HTTP request. @@ -1609,13 +1666,13 @@ PHP_METHOD(HttpRequest, send) SET_EH_THROW_HTTP(); if (obj->pool) { - http_error(E_WARNING, HTTP_E_CURL, "Cannot perform HttpRequest::send() while attached to an HttpRequestPool"); + http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot perform HttpRequest::send() while attached to an HttpRequestPool"); SET_EH_NORMAL(); RETURN_FALSE; } if (SUCCESS == (status = http_request_object_requesthandler(obj, getThis(), &body))) { - status = http_request_exec(obj->ch, NULL); + status = http_request_exec(obj->ch, NULL, &obj->response, &obj->request); } http_request_body_dtor(&body); @@ -1629,41 +1686,6 @@ PHP_METHOD(HttpRequest, send) } /* }}} */ -/* {{{ proto private HttpRequest::debugWrapper(long type, string message) - */ -PHP_METHOD(HttpRequest, debugWrapper) -{ - getObject(http_request_object, obj); - zval *type, *message, *dbg_user_cb = GET_PROP(obj, dbg_user_cb); - - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &type, &message)) { - RETURN_NULL(); - } - if (Z_TYPE_P(type) != IS_LONG) { - convert_to_long_ex(&type); - } - if (Z_TYPE_P(message) != IS_STRING) { - convert_to_string_ex(&message); - } - - /* fetch outgoing request message */ - if (Z_LVAL_P(type) == CURLINFO_HEADER_OUT || Z_LVAL_P(type) == CURLINFO_DATA_OUT) { - phpstr_append(&obj->request, Z_STRVAL_P(message), Z_STRLEN_P(message)); - } - - /* call user debug callback */ - if (Z_TYPE_P(dbg_user_cb) != IS_NULL) { - zval *args[2], cb_ret; - - args[0] = type; - args[1] = message; - call_user_function(EG(function_table), NULL, dbg_user_cb, &cb_ret, 2, args TSRMLS_CC); - } - - RETURN_NULL(); -} -/* }}} */ - #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */ /*