X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_request.c;h=42416890aaa6239e372b764a75fa8b17b9845493;hb=3de3e5f65db0e7c24849c0e7c60c54a4e8566422;hp=6b8d444b4e00169eea131083350d02e0560e5f6f;hpb=7dc5de0b79846bfe33ca36a9eeb894ef2ecfdee1;p=m6w6%2Fext-http diff --git a/php_http_request.c b/php_http_request.c index 6b8d444..4241689 100644 --- a/php_http_request.c +++ b/php_http_request.c @@ -6,18 +6,13 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2010, Michael Wallner | + | Copyright (c) 2004-2011, Michael Wallner | +--------------------------------------------------------------------+ */ -/* $Id: php_http_request_api.c 298591 2010-04-26 11:46:55Z mike $ */ - -#include "php_http.h" +#include "php_http_api.h" #include -#include -#include - PHP_HTTP_API php_http_request_t *php_http_request_init(php_http_request_t *h, php_http_request_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC) { @@ -29,8 +24,8 @@ PHP_HTTP_API php_http_request_t *php_http_request_init(php_http_request_t *h, ph memset(h, 0, sizeof(*h)); h->ops = ops; - h->rf = rf ? rf : php_http_resource_factory_init(NULL, h->ops->rsrc, NULL, NULL TSRMLS_CC); - h->buffer = php_http_buffer_init(NULL TSRMLS_CC); + h->rf = rf ? rf : php_http_resource_factory_init(NULL, h->ops->rsrc, h, NULL); + h->buffer = php_http_buffer_init(NULL); h->parser = php_http_message_parser_init(NULL TSRMLS_CC); h->message = php_http_message_init(NULL, 0 TSRMLS_CC); @@ -40,7 +35,8 @@ PHP_HTTP_API php_http_request_t *php_http_request_init(php_http_request_t *h, ph if (!(h = h->ops->init(h, init_arg))) { php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST, "Could not initialize request"); if (free_h) { - efree(free_h); + h->ops->dtor = NULL; + php_http_request_free(&free_h); } } } @@ -56,10 +52,6 @@ PHP_HTTP_API void php_http_request_dtor(php_http_request_t *h) php_http_resource_factory_free(&h->rf); - if (h->persistent_handle_id) { - zval_ptr_dtor(&h->persistent_handle_id); - } - php_http_message_parser_free(&h->parser); php_http_message_free(&h->message); php_http_buffer_free(&h->buffer); @@ -76,10 +68,30 @@ PHP_HTTP_API void php_http_request_free(php_http_request_t **h) PHP_HTTP_API php_http_request_t *php_http_request_copy(php_http_request_t *from, php_http_request_t *to) { - if (from->ops->copy) { - return from->ops->copy(from, to); + if (!from->ops->copy) { + return NULL; + } else { + TSRMLS_FETCH_FROM_CTX(from->ts); + + if (!to) { + to = ecalloc(1, sizeof(*to)); + } + + to->ops = from->ops; + if (from->rf) { + php_http_resource_factory_addref(from->rf); + to->rf = from->rf; + } else { + to->rf = php_http_resource_factory_init(NULL, to->ops->rsrc, to, NULL); + } + to->buffer = php_http_buffer_init(NULL); + to->parser = php_http_message_parser_init(NULL TSRMLS_CC); + to->message = php_http_message_init(NULL, 0 TSRMLS_CC); + + TSRMLS_SET_CTX(to->ts); + + return to->ops->copy(from, to); } - return NULL; } PHP_HTTP_API STATUS php_http_request_exec(php_http_request_t *h, php_http_request_method_t meth, const char *url, php_http_message_body_t *body) @@ -187,11 +199,11 @@ PHP_HTTP_END_ARGS; PHP_HTTP_EMPTY_ARGS(getBody); PHP_HTTP_BEGIN_ARGS(setBody, 0) - PHP_HTTP_ARG_OBJ(http\\message\\Body, body, 0) + PHP_HTTP_ARG_OBJ(http\\Message\\Body, body, 0) PHP_HTTP_END_ARGS; PHP_HTTP_BEGIN_ARGS(addBody, 1) - PHP_HTTP_ARG_OBJ(http\\message\\Body, body, 0) + PHP_HTTP_ARG_OBJ(http\\Message\\Body, body, 0) PHP_HTTP_END_ARGS; PHP_HTTP_BEGIN_ARGS(getResponseCookies, 0) @@ -212,9 +224,7 @@ PHP_HTTP_BEGIN_ARGS(setMessageClass, 1) PHP_HTTP_END_ARGS; PHP_HTTP_EMPTY_ARGS(getResponseMessage); -PHP_HTTP_EMPTY_ARGS(getRawResponseMessage); PHP_HTTP_EMPTY_ARGS(getRequestMessage); -PHP_HTTP_EMPTY_ARGS(getRawRequestMessage); PHP_HTTP_EMPTY_ARGS(getHistory); PHP_HTTP_EMPTY_ARGS(clearHistory); PHP_HTTP_EMPTY_ARGS(send); @@ -421,7 +431,7 @@ STATUS php_http_request_object_requesthandler(php_http_request_object_t *obj, zv } if (url) { - php_url *tmp, qdu = {0}; + php_url *tmp, qdu = {NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL}; zval *zurl = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("url"), 0 TSRMLS_CC); zval *zqdata = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("queryData"), 0 TSRMLS_CC); @@ -437,6 +447,9 @@ STATUS php_http_request_object_requesthandler(php_http_request_object_t *obj, zv if (Z_TYPE_P(zbody) == IS_OBJECT) { *body = ((php_http_message_body_object_t *)zend_object_store_get_object(zbody TSRMLS_CC))->body; + if (*body) { + php_stream_rewind(php_http_message_body_stream(*body)); + } } } @@ -465,6 +478,13 @@ STATUS php_http_request_object_requesthandler(php_http_request_object_t *obj, zv return SUCCESS; } +static inline void empty_response(zval *this_ptr TSRMLS_DC) +{ + zend_update_property_null(php_http_request_class_entry, getThis(), ZEND_STRL("responseMessage") TSRMLS_CC); + zend_update_property_long(php_http_request_class_entry, getThis(), ZEND_STRL("responseCode"), 0 TSRMLS_CC); + zend_update_property_string(php_http_request_class_entry, getThis(), ZEND_STRL("responseStatus"), "" TSRMLS_CC); +} + STATUS php_http_request_object_responsehandler(php_http_request_object_t *obj, zval *this_ptr TSRMLS_DC) { STATUS ret = SUCCESS; @@ -479,54 +499,55 @@ STATUS php_http_request_object_responsehandler(php_http_request_object_t *obj, z zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("transferInfo"), info TSRMLS_CC); zval_ptr_dtor(&info); - /* update history * / - if (i_zend_is_true(zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("recordHistory"), 0 TSRMLS_CC))) { - zval *new_hist, *old_hist = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("history"), 0 TSRMLS_CC); - zend_object_value ov = php_http_request_object_message(getThis(), obj->request->message_parser.message TSRMLS_CC); + if ((msg = obj->request->message)) { + /* update history */ + if (i_zend_is_true(zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("recordHistory"), 0 TSRMLS_CC))) { + zval *new_hist, *old_hist = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("history"), 0 TSRMLS_CC); + zend_object_value ov = php_http_request_object_message(getThis(), php_http_message_copy(msg, NULL) TSRMLS_CC); + + MAKE_STD_ZVAL(new_hist); + ZVAL_OBJVAL(new_hist, ov, 0); - MAKE_STD_ZVAL(new_hist); - ZVAL_OBJVAL(new_hist, ov, 0); + if (Z_TYPE_P(old_hist) == IS_OBJECT) { + php_http_message_object_prepend(new_hist, old_hist, 1 TSRMLS_CC); + } - if (Z_TYPE_P(old_hist) == IS_OBJECT) { - php_http_message_object_prepend(new_hist, old_hist, 0 TSRMLS_CC); + zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("history"), new_hist TSRMLS_CC); + zval_ptr_dtor(&new_hist); } - zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("history"), new_hist TSRMLS_CC); - zval_ptr_dtor(&new_hist); - } -*/ -// if ((msg = obj->request->_current.request)) { -// /* update request message */ -// zval *message; -// -// MAKE_STD_ZVAL(message); -// ZVAL_OBJVAL(message, php_http_request_object_message(getThis(), msg TSRMLS_CC), 1); -// zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("requestMessage"), message TSRMLS_CC); -// } -// fprintf(stderr, "RESPONSE MESSAGE: %p\n", obj->request->parser.msg); - if ((msg = obj->request->message)) { - /* update properties with response info */ - zval *message; + /* update response info */ + if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, msg)) { + zval *message; - zend_update_property_long(php_http_request_class_entry, getThis(), ZEND_STRL("responseCode"), msg->http.info.response.code TSRMLS_CC); - zend_update_property_string(php_http_request_class_entry, getThis(), ZEND_STRL("responseStatus"), STR_PTR(msg->http.info.response.status) TSRMLS_CC); + zend_update_property_long(php_http_request_class_entry, getThis(), ZEND_STRL("responseCode"), msg->http.info.response.code TSRMLS_CC); + zend_update_property_string(php_http_request_class_entry, getThis(), ZEND_STRL("responseStatus"), STR_PTR(msg->http.info.response.status) TSRMLS_CC); - MAKE_STD_ZVAL(message); - ZVAL_OBJVAL(message, php_http_request_object_message(getThis(), msg TSRMLS_CC), 0); - zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("responseMessage"), message TSRMLS_CC); - zval_ptr_dtor(&message); - obj->request->message = php_http_message_init(NULL, 0 TSRMLS_CC); + MAKE_STD_ZVAL(message); + ZVAL_OBJVAL(message, php_http_request_object_message(getThis(), msg TSRMLS_CC), 0); + zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("responseMessage"), message TSRMLS_CC); + zval_ptr_dtor(&message); + + obj->request->message = php_http_message_init(NULL, 0 TSRMLS_CC); + msg = msg->parent; + } else { + empty_response(getThis() TSRMLS_CC); + } } else { /* update properties with empty values */ - zval *znull; + empty_response(getThis() TSRMLS_CC); + } - MAKE_STD_ZVAL(znull); - ZVAL_NULL(znull); - zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("responseMessage"), znull TSRMLS_CC); - zval_ptr_dtor(&znull); + while (msg && !PHP_HTTP_MESSAGE_TYPE(REQUEST, msg)) { + msg = msg->parent; + } + if (PHP_HTTP_MESSAGE_TYPE(REQUEST, msg)) { + zval *message; - zend_update_property_long(php_http_request_class_entry, getThis(), ZEND_STRL("responseCode"), 0 TSRMLS_CC); - zend_update_property_string(php_http_request_class_entry, getThis(), ZEND_STRL("responseStatus"), "" TSRMLS_CC); + MAKE_STD_ZVAL(message); + ZVAL_OBJVAL(message, php_http_request_object_message(getThis(), php_http_message_copy_ex(msg, NULL, 0) TSRMLS_CC), 0); + zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("requestMessage"), message TSRMLS_CC); + zval_ptr_dtor(&message); } if (SUCCESS == php_http_request_getopt(obj->request, PHP_HTTP_REQUEST_OPT_PROGRESS_INFO, &progress)) { @@ -539,10 +560,16 @@ STATUS php_http_request_object_responsehandler(php_http_request_object_t *obj, z return ret; } -static int apply_pretty_key(void *pDest, int num_args, va_list args, zend_hash_key *hash_key) +static int apply_pretty_key(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) { + zval **zpp = pDest, *arr = va_arg(args, zval *); + if (hash_key->arKey && hash_key->nKeyLength > 1) { - hash_key->h = zend_hash_func(php_http_pretty_key(hash_key->arKey, hash_key->nKeyLength - 1, 1, 0), hash_key->nKeyLength); + char *tmp = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 0); + + Z_ADDREF_PP(zpp); + add_assoc_zval_ex(arr, tmp, hash_key->nKeyLength, *zpp); + efree(tmp); } return ZEND_HASH_APPLY_KEEP; } @@ -559,7 +586,7 @@ static inline void php_http_request_object_set_options_subr(INTERNAL_FUNCTION_PA array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); } - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) { + if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) { if (overwrite) { zend_hash_clean(Z_ARRVAL_PP(entry)); } @@ -572,9 +599,15 @@ static inline void php_http_request_object_set_options_subr(INTERNAL_FUNCTION_PA } } else if (opts) { if (prettify_keys) { - zend_hash_apply_with_arguments(Z_ARRVAL_P(opts) TSRMLS_CC, apply_pretty_key, 0, NULL); + zval *tmp; + + MAKE_STD_ZVAL(tmp); + array_init_size(tmp, zend_hash_num_elements(Z_ARRVAL_P(opts))); + zend_hash_apply_with_arguments(Z_ARRVAL_P(opts) TSRMLS_CC, apply_pretty_key, 1, tmp); + opts = tmp; + } else { + Z_ADDREF_P(opts); } - Z_ADDREF_P(opts); add_assoc_zval_ex(new_opts, key, len, opts); } zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC); @@ -593,7 +626,7 @@ static inline void php_http_request_object_get_options_subr(INTERNAL_FUNCTION_PA array_init(return_value); if ( (Z_TYPE_P(opts) == IS_ARRAY) && - (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) { + (SUCCESS == zend_symtable_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) { convert_to_array(*options); array_copy(Z_ARRVAL_PP(options), Z_ARRVAL_P(return_value)); } @@ -710,7 +743,7 @@ PHP_METHOD(HttpRequest, getTransferInfo) } if (info_len && info_name) { - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), php_http_pretty_key(info_name, info_len, 0, 0), info_len + 1, (void *) &infop)) { + if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(info), php_http_pretty_key(info_name, info_len, 0, 0), info_len + 1, (void *) &infop)) { RETVAL_ZVAL(*infop, 1, 0); } else { php_http_error(HE_NOTICE, PHP_HTTP_E_INVALID_PARAM, "Could not find transfer info named %s", info_name); @@ -782,7 +815,7 @@ PHP_METHOD(HttpRequest, setOptions) } else if (Z_TYPE_PP(opt) == IS_NULL) { old_opts = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); if (Z_TYPE_P(old_opts) == IS_ARRAY) { - zend_hash_del(Z_ARRVAL_P(old_opts), key.str, key.len); + zend_symtable_del(Z_ARRVAL_P(old_opts), key.str, key.len); } } else { Z_ADDREF_P(*opt); @@ -969,7 +1002,7 @@ PHP_METHOD(HttpRequest, setQueryData) char *query_data_str = NULL; size_t query_data_len; - if (SUCCESS == php_http_url_encode_hash(HASH_OF(qdata), 0, NULL, 0, &query_data_str, &query_data_len TSRMLS_CC)) { + if (SUCCESS == php_http_url_encode_hash(HASH_OF(qdata), NULL, 0, &query_data_str, &query_data_len TSRMLS_CC)) { zend_update_property_stringl(php_http_request_class_entry, getThis(), ZEND_STRL("queryData"), query_data_str, query_data_len TSRMLS_CC); efree(query_data_str); } @@ -1000,7 +1033,7 @@ PHP_METHOD(HttpRequest, addQueryData) size_t query_data_len = 0; zval *old_qdata = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("queryData"), 0 TSRMLS_CC); - if (SUCCESS == php_http_url_encode_hash(HASH_OF(qdata), 1, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data_str, &query_data_len TSRMLS_CC)) { + if (SUCCESS == php_http_url_encode_hash(HASH_OF(qdata), Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data_str, &query_data_len TSRMLS_CC)) { zend_update_property_stringl(php_http_request_class_entry, getThis(), ZEND_STRL("queryData"), query_data_str, query_data_len TSRMLS_CC); efree(query_data_str); } @@ -1112,7 +1145,7 @@ PHP_METHOD(HttpRequest, getResponseCookies) FOREACH_VAL(pos2, *header, single_header) { zval *data = php_http_ztyp(IS_STRING, *single_header); - if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), flags, allowed_extras TSRMLS_CC))) { + if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), Z_STRLEN_P(data), flags, allowed_extras TSRMLS_CC))) { zval *cookie; MAKE_STD_ZVAL(cookie); @@ -1123,7 +1156,7 @@ PHP_METHOD(HttpRequest, getResponseCookies) } } else { zval *data = php_http_ztyp(IS_STRING, *header); - if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), flags, allowed_extras TSRMLS_CC))) { + if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), Z_STRLEN_P(data), flags, allowed_extras TSRMLS_CC))) { zval *cookie; MAKE_STD_ZVAL(cookie); @@ -1150,12 +1183,17 @@ PHP_METHOD(HttpRequest, getResponseCookies) PHP_METHOD(HttpRequest, getResponseBody) { - if (SUCCESS == zend_parse_parameters_none()) { - zval *message = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("responseMessage"), 0 TSRMLS_CC); + with_error_handling(EH_THROW, php_http_exception_class_entry) { + if (SUCCESS == zend_parse_parameters_none()) { + zval *message = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("responseMessage"), 0 TSRMLS_CC); - RETURN_OBJVAL(((php_http_message_object_t *)zend_object_store_get_object(message TSRMLS_CC))->body, 1); - } - RETURN_FALSE; + if (Z_TYPE_P(message) == IS_OBJECT) { + RETURN_OBJVAL(((php_http_message_object_t *)zend_object_store_get_object(message TSRMLS_CC))->body, 1); + } else { + php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "HttpRequest does not contain a response message"); + } + } + } end_error_handling(); } PHP_METHOD(HttpRequest, getResponseCode) @@ -1280,7 +1318,7 @@ PHP_MINIT_FUNCTION(http_request) memcpy(&php_http_request_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_request_object_handlers.clone_obj = php_http_request_object_clone; - zend_class_implements(php_http_request_class_entry TSRMLS_CC, 2, spl_ce_SplSubject, php_http_fluently_callable_class_entry); + zend_class_implements(php_http_request_class_entry TSRMLS_CC, 1, spl_ce_SplSubject); zend_declare_property_null(php_http_request_class_entry, ZEND_STRL("observers"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(php_http_request_class_entry, ZEND_STRL("options"), ZEND_ACC_PRIVATE TSRMLS_CC);