X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client.c;h=29da4c90ec4788b592e027742f59550a9bd437e7;hp=7b8d85967ecd3e629da3b3c6c47835e1bbb8663d;hb=f05a032e5e994a8b1ea8b5ab0291f1d1d6d42355;hpb=19a017f746fe281d828d1783ef2a5991ce6114e4 diff --git a/php_http_client.c b/php_http_client.c index 7b8d859..29da4c9 100644 --- a/php_http_client.c +++ b/php_http_client.c @@ -13,6 +13,7 @@ #include "php_http_api.h" #include +#include PHP_HTTP_API php_http_client_t *php_http_client_init(php_http_client_t *h, php_http_client_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC) { @@ -24,10 +25,18 @@ PHP_HTTP_API php_http_client_t *php_http_client_init(php_http_client_t *h, php_h memset(h, 0, sizeof(*h)); h->ops = ops; - 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); + if (rf) { + h->rf = rf; + } else if (ops->rsrc) { + h->rf = php_http_resource_factory_init(NULL, h->ops->rsrc, h, NULL); + } + h->request.buffer = php_http_buffer_init(NULL); + h->request.parser = php_http_message_parser_init(NULL TSRMLS_CC); + h->request.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); + + h->response.buffer = php_http_buffer_init(NULL); + h->response.parser = php_http_message_parser_init(NULL TSRMLS_CC); + h->response.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); TSRMLS_SET_CTX(h->ts); @@ -52,9 +61,13 @@ PHP_HTTP_API void php_http_client_dtor(php_http_client_t *h) php_http_resource_factory_free(&h->rf); - php_http_message_parser_free(&h->parser); - php_http_message_free(&h->message); - php_http_buffer_free(&h->buffer); + php_http_message_parser_free(&h->request.parser); + php_http_message_free(&h->request.message); + php_http_buffer_free(&h->request.buffer); + + php_http_message_parser_free(&h->response.parser); + php_http_message_free(&h->response.message); + php_http_buffer_free(&h->response.buffer); } PHP_HTTP_API void php_http_client_free(php_http_client_t **h) @@ -81,12 +94,17 @@ PHP_HTTP_API php_http_client_t *php_http_client_copy(php_http_client_t *from, ph if (from->rf) { php_http_resource_factory_addref(from->rf); to->rf = from->rf; - } else { + } else if (to->ops->rsrc){ 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); + + to->request.buffer = php_http_buffer_init(NULL); + to->request.parser = php_http_message_parser_init(NULL TSRMLS_CC); + to->request.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); + + to->response.buffer = php_http_buffer_init(NULL); + to->response.parser = php_http_message_parser_init(NULL TSRMLS_CC); + to->response.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); TSRMLS_SET_CTX(to->ts); @@ -165,8 +183,8 @@ PHP_HTTP_BEGIN_ARGS(resetCookies, 0) PHP_HTTP_END_ARGS; PHP_HTTP_EMPTY_ARGS(flushCookies); -PHP_HTTP_EMPTY_ARGS(getMessageClass); -PHP_HTTP_BEGIN_ARGS(setMessageClass, 1) +PHP_HTTP_EMPTY_ARGS(getResponseMessageClass); +PHP_HTTP_BEGIN_ARGS(setResponseMessageClass, 1) PHP_HTTP_ARG_VAL(message_class_name, 0) PHP_HTTP_END_ARGS; @@ -174,9 +192,11 @@ PHP_HTTP_EMPTY_ARGS(getResponseMessage); PHP_HTTP_EMPTY_ARGS(getRequestMessage); PHP_HTTP_EMPTY_ARGS(getHistory); PHP_HTTP_EMPTY_ARGS(clearHistory); -PHP_HTTP_BEGIN_ARGS(send, 1) - PHP_HTTP_ARG_VAL(request, 0) + +PHP_HTTP_BEGIN_ARGS(setRequest, 1) + PHP_HTTP_ARG_OBJ(http\\Client\\Request, request, 1) PHP_HTTP_END_ARGS; +PHP_HTTP_EMPTY_ARGS(getRequest); PHP_HTTP_EMPTY_ARGS(getObservers); PHP_HTTP_BEGIN_ARGS(attach, 1) @@ -191,9 +211,22 @@ PHP_HTTP_BEGIN_ARGS(getTransferInfo, 0) PHP_HTTP_ARG_VAL(name, 0) PHP_HTTP_END_ARGS; +PHP_HTTP_BEGIN_ARGS(request, 2) + PHP_HTTP_ARG_VAL(method, 0) + PHP_HTTP_ARG_VAL(url, 0) + PHP_HTTP_ARG_ARR(headers, 1, 0) + PHP_HTTP_ARG_VAL(body, 0) + PHP_HTTP_ARG_ARR(options, 1, 0) +PHP_HTTP_END_ARGS; + +static zend_class_entry *php_http_client_class_entry; + +zend_class_entry *php_http_client_get_class_entry(void) +{ + return php_http_client_class_entry; +} -zend_class_entry *php_http_client_class_entry; -zend_function_entry php_http_client_method_entry[] = { +static zend_function_entry php_http_client_method_entry[] = { PHP_HTTP_CLIENT_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_HTTP_CLIENT_ME(getObservers, ZEND_ACC_PUBLIC) PHP_HTTP_CLIENT_ME(notify, ZEND_ACC_PUBLIC) @@ -216,15 +249,18 @@ zend_function_entry php_http_client_method_entry[] = { PHP_HTTP_CLIENT_ME(resetCookies, ZEND_ACC_PUBLIC) PHP_HTTP_CLIENT_ME(flushCookies, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_ME(send, ZEND_ACC_PUBLIC) + PHP_HTTP_CLIENT_ME(setRequest, ZEND_ACC_PUBLIC) + PHP_HTTP_CLIENT_ME(getRequest, ZEND_ACC_PUBLIC) PHP_HTTP_CLIENT_ME(getResponseMessage, ZEND_ACC_PUBLIC) PHP_HTTP_CLIENT_ME(getRequestMessage, ZEND_ACC_PUBLIC) PHP_HTTP_CLIENT_ME(getHistory, ZEND_ACC_PUBLIC) PHP_HTTP_CLIENT_ME(clearHistory, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_ME(getMessageClass, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_ME(setMessageClass, ZEND_ACC_PUBLIC) + PHP_HTTP_CLIENT_ME(getResponseMessageClass, ZEND_ACC_PUBLIC) + PHP_HTTP_CLIENT_ME(setResponseMessageClass, ZEND_ACC_PUBLIC) + + PHP_HTTP_CLIENT_ME(request, ZEND_ACC_PUBLIC) EMPTY_FUNCTION_ENTRY }; @@ -236,6 +272,19 @@ zend_object_handlers *php_http_client_get_object_handlers(void) return &php_http_client_object_handlers; } +static php_http_client_ops_t php_http_client_user_ops = { + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + (php_http_new_t) php_http_client_object_new_ex, + php_http_client_get_class_entry +}; + zend_object_value php_http_client_object_new(zend_class_entry *ce TSRMLS_DC) { return php_http_client_object_new_ex(ce, NULL, NULL TSRMLS_CC); @@ -246,21 +295,21 @@ zend_object_value php_http_client_object_new_ex(zend_class_entry *ce, php_http_c zend_object_value ov; php_http_client_object_t *o; - o = ecalloc(1, sizeof(php_http_client_object_t)); + o = ecalloc(1, sizeof(*o)); zend_object_std_init((zend_object *) o, ce TSRMLS_CC); object_properties_init((zend_object *) o, ce); + + ov.handle = zend_objects_store_put(o, NULL, php_http_client_object_free, NULL TSRMLS_CC); + ov.handlers = &php_http_client_object_handlers; if (!(o->client = r)) { - o->client = php_http_client_init(NULL, NULL, NULL, NULL TSRMLS_CC); + o->client = php_http_client_init(NULL, &php_http_client_user_ops, NULL, &ov TSRMLS_CC); } if (ptr) { *ptr = o; } - ov.handle = zend_objects_store_put(o, NULL, php_http_client_object_free, NULL TSRMLS_CC); - ov.handlers = &php_http_client_object_handlers; - return ov; } @@ -284,159 +333,72 @@ void php_http_client_object_free(void *object TSRMLS_DC) efree(o); } -static inline void php_http_client_object_check_request_content_type(zval *this_ptr TSRMLS_DC) -{ - zval *ctype = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("contentType"), 0 TSRMLS_CC); - - if (Z_STRLEN_P(ctype)) { - zval **headers, *opts = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); - - if ( (Z_TYPE_P(opts) == IS_ARRAY) && - (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), ZEND_STRS("headers"), (void *) &headers)) && - (Z_TYPE_PP(headers) == IS_ARRAY)) { - zval **ct_header; - - /* only override if not already set */ - if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(headers), ZEND_STRS("Content-Type"), (void *) &ct_header))) { - add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); - } else - /* or not a string, zero length string or a string of spaces */ - if ((Z_TYPE_PP(ct_header) != IS_STRING) || !Z_STRLEN_PP(ct_header)) { - add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); - } else { - int i, only_space = 1; - - /* check for spaces only */ - for (i = 0; i < Z_STRLEN_PP(ct_header); ++i) { - if (!PHP_HTTP_IS_CTYPE(space, Z_STRVAL_PP(ct_header)[i])) { - only_space = 0; - break; - } - } - if (only_space) { - add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); - } - } - } else { - zval *headers; - - MAKE_STD_ZVAL(headers); - array_init(headers); - add_assoc_stringl(headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); - zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, headers); - zval_ptr_dtor(&headers); - } - } -} - static inline zend_object_value php_http_client_object_message(zval *this_ptr, php_http_message_t *msg TSRMLS_DC) { zend_object_value ov; - zval *zcn = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("messageClass"), 0 TSRMLS_CC); + zval *zcn = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("responseMessageClass"), 0 TSRMLS_CC); zend_class_entry *class_entry; if (Z_STRLEN_P(zcn) && (class_entry = zend_fetch_class(Z_STRVAL_P(zcn), Z_STRLEN_P(zcn), 0 TSRMLS_CC)) - && (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_object_new_ex, php_http_client_response_class_entry, msg, NULL TSRMLS_CC))) { + && (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_object_new_ex, php_http_client_response_get_class_entry(), msg, NULL TSRMLS_CC))) { return ov; } else { - return php_http_message_object_new_ex(php_http_client_response_class_entry, msg, NULL TSRMLS_CC); + return php_http_message_object_new_ex(php_http_client_response_get_class_entry(), msg, NULL TSRMLS_CC); } } -STATUS php_http_client_object_handle_request(zval *zclient, zval *zreq TSRMLS_DC) +STATUS php_http_client_object_handle_request(zval *zclient, zval **zreq TSRMLS_DC) { php_http_client_object_t *obj = zend_object_store_get_object(zclient TSRMLS_CC); php_http_client_progress_t *progress; zval *zoptions; + HashTable options; - /* reset request handle */ - php_http_client_reset(obj->client); - - /* remember the request */ - zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("request"), zreq TSRMLS_CC); - - /* reset transfer info */ - zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("info") TSRMLS_CC); - - /* set request options */ - zoptions = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("options"), 0 TSRMLS_CC); - php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_SETTINGS, Z_ARRVAL_P(zoptions)); - - /* set progress callback */ - if (SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, &progress)) { - if (!progress->callback) { - php_http_client_progress_callback_t *callback = emalloc(sizeof(*callback)); - - callback->type = PHP_HTTP_CLIENT_PROGRESS_CALLBACK_USER; - callback->pass_state = 0; - MAKE_STD_ZVAL(callback->func.user); - array_init(callback->func.user); - Z_ADDREF_P(zclient); - add_next_index_zval(callback->func.user, zclient); - add_next_index_stringl(callback->func.user, ZEND_STRL("notify"), 1); + /* do we have a valid request? */ + if (*zreq) { + /* remember the request */ + zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("request"), *zreq TSRMLS_CC); + } else { + /* maybe a request is already set */ + *zreq = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("request"), 0 TSRMLS_CC); - php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_CALLBACK, callback); + if (Z_TYPE_PP(zreq) != IS_OBJECT || !instanceof_function(Z_OBJCE_PP(zreq), php_http_client_request_get_class_entry() TSRMLS_CC)) { + php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "The client does not have a valid request set"); + return FAILURE; } - progress->state.info = "start"; - php_http_client_progress_notify(progress TSRMLS_CC); - progress->state.started = 1; } - return SUCCESS; -} - -STATUS php_http_client_object_requesthandler(php_http_client_object_t *obj, zval *this_ptr, char **meth, char **url, php_http_message_body_t **body TSRMLS_DC) -{ - zval *zoptions; - php_http_client_progress_t *progress; - /* reset request handle */ php_http_client_reset(obj->client); - /* reset transfer info */ - zend_update_property_null(php_http_client_class_entry, getThis(), ZEND_STRL("info") TSRMLS_CC); - if (meth) { - *meth = Z_STRVAL_P(zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("method"), 0 TSRMLS_CC)); - } + /* reset transfer info */ + zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("transferInfo") TSRMLS_CC); - if (url) { - php_url *tmp, qdu = {NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL}; - zval *zurl = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("url"), 0 TSRMLS_CC); - zval *zqdata = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("queryData"), 0 TSRMLS_CC); - if (Z_STRLEN_P(zqdata)) { - qdu.query = Z_STRVAL_P(zqdata); - } - php_http_url(0, tmp = php_url_parse(Z_STRVAL_P(zurl)), &qdu, NULL, url, NULL TSRMLS_CC); - php_url_free(tmp); + /* set client options */ + zend_hash_init(&options, 0, NULL, ZVAL_PTR_DTOR, 0); + zoptions = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("options"), 0 TSRMLS_CC); + if (Z_TYPE_P(zoptions) == IS_ARRAY && zend_hash_num_elements(Z_ARRVAL_P(zoptions))) { + php_array_merge(&options, Z_ARRVAL_P(zoptions), 1 TSRMLS_CC); } - - if (body) { - zval *zbody = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("requestBody"), 0 TSRMLS_CC); - - 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)); - } - } + zoptions = zend_read_property(php_http_client_request_get_class_entry(), *zreq, ZEND_STRL("options"), 0 TSRMLS_CC); + if (Z_TYPE_P(zoptions) == IS_ARRAY && zend_hash_num_elements(Z_ARRVAL_P(zoptions))) { + php_array_merge(&options, Z_ARRVAL_P(zoptions), 1 TSRMLS_CC); } + php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_SETTINGS, &options); + zend_hash_destroy(&options); - php_http_client_object_check_request_content_type(getThis() TSRMLS_CC); - zoptions = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); - php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_SETTINGS, Z_ARRVAL_P(zoptions)); - + /* set progress callback */ if (SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, &progress)) { if (!progress->callback) { php_http_client_progress_callback_t *callback = emalloc(sizeof(*callback)); callback->type = PHP_HTTP_CLIENT_PROGRESS_CALLBACK_USER; - callback->pass_state = 0; MAKE_STD_ZVAL(callback->func.user); array_init(callback->func.user); - Z_ADDREF_P(getThis()); - add_next_index_zval(callback->func.user, getThis()); + Z_ADDREF_P(zclient); + add_next_index_zval(callback->func.user, zclient); add_next_index_stringl(callback->func.user, ZEND_STRL("notify"), 1); php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_CALLBACK, callback); @@ -445,13 +407,10 @@ STATUS php_http_client_object_requesthandler(php_http_client_object_t *obj, zval php_http_client_progress_notify(progress TSRMLS_CC); progress->state.started = 1; } + return SUCCESS; } -static inline void empty_response(zval *this_ptr TSRMLS_DC) -{ - zend_update_property_null(php_http_client_class_entry, getThis(), ZEND_STRL("responseMessage") TSRMLS_CC); -} STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC) { @@ -467,11 +426,11 @@ STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC) zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("transferInfo"), info TSRMLS_CC); zval_ptr_dtor(&info); - if ((msg = obj->client->message)) { - /* update history */ + if ((msg = obj->client->response.message)) { if (i_zend_is_true(zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("recordHistory"), 0 TSRMLS_CC))) { zval *new_hist, *old_hist = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), 0 TSRMLS_CC); - zend_object_value ov = php_http_client_object_message(zclient, php_http_message_copy(msg, NULL) TSRMLS_CC); + php_http_message_t *zipped = php_http_message_zip(obj->client->response.message, obj->client->request.message); + zend_object_value ov = php_http_client_object_message(zclient, zipped TSRMLS_CC); MAKE_STD_ZVAL(new_hist); ZVAL_OBJVAL(new_hist, ov, 0); @@ -493,8 +452,7 @@ STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC) zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("responseMessage"), message TSRMLS_CC); zval_ptr_dtor(&message); - obj->client->message = php_http_message_init(NULL, 0 TSRMLS_CC); - msg = msg->parent; + obj->client->response.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); } else { zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("responseMessage") TSRMLS_CC); } @@ -502,91 +460,17 @@ STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC) zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("responseMessage") TSRMLS_CC); } - /* there might be a 100-Continue response in between */ - while (msg && !PHP_HTTP_MESSAGE_TYPE(REQUEST, msg)) { - msg = msg->parent; - } - - if (PHP_HTTP_MESSAGE_TYPE(REQUEST, msg)) { - zval *message; - - /* update the actual request message */ - MAKE_STD_ZVAL(message); - ZVAL_OBJVAL(message, php_http_message_object_new_ex(php_http_message_class_entry, php_http_message_copy_ex(msg, NULL, 0), NULL TSRMLS_CC), 0); - zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("requestMessage"), message TSRMLS_CC); - zval_ptr_dtor(&message); - } - - if (SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, &progress)) { - progress->state.info = "finished"; - progress->state.finished = 1; - php_http_client_progress_notify(progress TSRMLS_CC); - } - php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_CALLBACK, NULL); - - return SUCCESS; -} - -STATUS php_http_client_object_responsehandler(php_http_client_object_t *obj, zval *this_ptr TSRMLS_DC) -{ - STATUS ret = SUCCESS; - zval *info; - php_http_message_t *msg; - php_http_client_progress_t *progress; - - /* always fetch info */ - MAKE_STD_ZVAL(info); - array_init(info); - php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_TRANSFER_INFO, Z_ARRVAL_P(info)); - zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("transferInfo"), info TSRMLS_CC); - zval_ptr_dtor(&info); - - if ((msg = obj->client->message)) { - /* update history */ - if (i_zend_is_true(zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("recordHistory"), 0 TSRMLS_CC))) { - zval *new_hist, *old_hist = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("history"), 0 TSRMLS_CC); - zend_object_value ov = php_http_client_object_message(getThis(), php_http_message_copy(msg, NULL) TSRMLS_CC); - - 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); - } - - zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("history"), new_hist TSRMLS_CC); - zval_ptr_dtor(&new_hist); - } - - /* update response info */ - if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, msg)) { + if ((msg = obj->client->request.message)) { + if (PHP_HTTP_MESSAGE_TYPE(REQUEST, msg)) { zval *message; + /* update the actual request message */ MAKE_STD_ZVAL(message); - ZVAL_OBJVAL(message, php_http_client_object_message(getThis(), msg TSRMLS_CC), 0); - zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("responseMessage"), message TSRMLS_CC); + ZVAL_OBJVAL(message, php_http_message_object_new_ex(php_http_message_get_class_entry(), msg, NULL TSRMLS_CC), 0); + zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("requestMessage"), message TSRMLS_CC); zval_ptr_dtor(&message); - - obj->client->message = php_http_message_init(NULL, 0 TSRMLS_CC); - msg = msg->parent; - } else { - empty_response(getThis() TSRMLS_CC); + obj->client->request.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); } - } else { - /* update properties with empty values */ - empty_response(getThis() TSRMLS_CC); - } - - while (msg && !PHP_HTTP_MESSAGE_TYPE(REQUEST, msg)) { - msg = msg->parent; - } - if (PHP_HTTP_MESSAGE_TYPE(REQUEST, msg)) { - zval *message; - - MAKE_STD_ZVAL(message); - ZVAL_OBJVAL(message, php_http_client_object_message(getThis(), php_http_message_copy_ex(msg, NULL, 0) TSRMLS_CC), 0); - zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("requestMessage"), message TSRMLS_CC); - zval_ptr_dtor(&message); } if (SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, &progress)) { @@ -596,56 +480,38 @@ STATUS php_http_client_object_responsehandler(php_http_client_object_t *obj, zva } php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_CALLBACK, NULL); - return ret; -} - -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) { - 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; + return SUCCESS; } -static void php_http_client_object_set_options(INTERNAL_FUNCTION_PARAMETERS) +void php_http_client_options_set(zval *this_ptr, zval *opts TSRMLS_DC) { php_http_array_hashkey_t key = php_http_array_hashkey_init(0); HashPosition pos; - zval *opts = NULL, *old_opts, *new_opts, *add_opts, **opt; - - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { - RETURN_FALSE; - } + zval *new_opts; + zend_class_entry *this_ce = Z_OBJCE_P(getThis()); + zend_bool is_client = instanceof_function(this_ce, php_http_client_class_entry TSRMLS_CC); MAKE_STD_ZVAL(new_opts); array_init(new_opts); if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) { - zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC); + zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC); zval_ptr_dtor(&new_opts); } else { + zval *old_opts, *add_opts, **opt; + MAKE_STD_ZVAL(add_opts); array_init(add_opts); /* some options need extra attention -- thus cannot use array_merge() directly */ FOREACH_KEYVAL(pos, opts, key, opt) { if (key.type == HASH_KEY_IS_STRING) { #define KEYMATCH(k, s) ((sizeof(s)==k.len) && !strcasecmp(k.str, s)) - if (KEYMATCH(key, "ssl")) { - zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addssloptions", NULL, *opt); - } else if (KEYMATCH(key, "cookies")) { - zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addcookies", NULL, *opt); - } else if (KEYMATCH(key, "recordHistory")) { - zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("recordHistory"), *opt TSRMLS_CC); - } else if (KEYMATCH(key, "messageClass")) { - zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmessageclass", NULL, *opt); + if (Z_TYPE_PP(opt) == IS_ARRAY && (KEYMATCH(key, "ssl") || KEYMATCH(key, "cookies"))) { + php_http_client_options_set_subr(getThis(), key.str, key.len, *opt, 0 TSRMLS_CC); + } else if (is_client && (KEYMATCH(key, "recordHistory") || KEYMATCH(key, "responseMessageClass"))) { + zend_update_property(this_ce, getThis(), key.str, key.len-1, *opt TSRMLS_CC); } else if (Z_TYPE_PP(opt) == IS_NULL) { - old_opts = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); + old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); if (Z_TYPE_P(old_opts) == IS_ARRAY) { zend_symtable_del(Z_ARRVAL_P(old_opts), key.str, key.len); } @@ -656,88 +522,81 @@ static void php_http_client_object_set_options(INTERNAL_FUNCTION_PARAMETERS) } } - old_opts = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); + old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); if (Z_TYPE_P(old_opts) == IS_ARRAY) { array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); } array_join(Z_ARRVAL_P(add_opts), Z_ARRVAL_P(new_opts), 0, 0); - zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC); + zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC); zval_ptr_dtor(&new_opts); zval_ptr_dtor(&add_opts); } - - RETVAL_ZVAL(getThis(), 1, 0); } -static inline void php_http_client_object_set_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len, int overwrite, int prettify_keys) +void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zval *opts, int overwrite TSRMLS_DC) { - zval *old_opts, *new_opts, *opts = NULL, **entry = NULL; + if (overwrite || (opts && zend_hash_num_elements(Z_ARRVAL_P(opts)))) { + zend_class_entry *this_ce = Z_OBJCE_P(getThis()); + zval *old_opts, *new_opts, **entry = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &opts)) { MAKE_STD_ZVAL(new_opts); array_init(new_opts); - old_opts = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); + old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); if (Z_TYPE_P(old_opts) == IS_ARRAY) { array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); } - if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) { - if (overwrite) { - zend_hash_clean(Z_ARRVAL_PP(entry)); - } + if (overwrite) { if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) { - if (overwrite) { - array_copy(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry)); - } else { - array_join(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry), 0, prettify_keys ? ARRAY_JOIN_PRETTIFY : 0); - } + Z_ADDREF_P(opts); + zend_symtable_update(Z_ARRVAL_P(new_opts), key, len, (void *) &opts, sizeof(zval *), NULL); + } else { + zend_symtable_del(Z_ARRVAL_P(new_opts), key, len); } - } else if (opts) { - if (prettify_keys) { - 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 if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) { + if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) { + array_join(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry), 0, 0); } else { Z_ADDREF_P(opts); + zend_symtable_update(Z_ARRVAL_P(new_opts), key, len, (void *) &opts, sizeof(zval *), NULL); } - add_assoc_zval_ex(new_opts, key, len, opts); } - zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC); + + zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC); zval_ptr_dtor(&new_opts); } - - RETVAL_ZVAL(getThis(), 1, 0); } -static inline void php_http_client_object_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len) +void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value TSRMLS_DC) { - if (SUCCESS == zend_parse_parameters_none()) { - zval *opts, **options; - - opts = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); - array_init(return_value); + zend_class_entry *this_ce = Z_OBJCE_P(getThis()); + zval **options, *opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); - if ( (Z_TYPE_P(opts) == IS_ARRAY) && - (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)); - } + if ((Z_TYPE_P(opts) == IS_ARRAY) && (SUCCESS == zend_symtable_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) { + RETVAL_ZVAL(*options, 1, 0); } } PHP_METHOD(HttpClient, __construct) { - with_error_handling(EH_THROW, php_http_exception_class_entry) { - php_http_client_object_set_options(INTERNAL_FUNCTION_PARAM_PASSTHRU); + with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { + zval *os, *opts = NULL; + + MAKE_STD_ZVAL(os); + object_init_ex(os, spl_ce_SplObjectStorage); + zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), os TSRMLS_CC); + zval_ptr_dtor(&os); + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { + php_http_client_options_set(getThis(), opts TSRMLS_CC); + } + } end_error_handling(); } PHP_METHOD(HttpClient, getObservers) { - with_error_handling(EH_THROW, php_http_exception_class_entry) { + with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { if (SUCCESS == zend_parse_parameters_none()) { RETVAL_PROP(php_http_client_class_entry, "observers"); } @@ -804,17 +663,18 @@ PHP_METHOD(HttpClient, getProgress) { if (SUCCESS == zend_parse_parameters_none()) { php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - php_http_client_progress_t *progress; - - php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, &progress); - object_init(return_value); - add_property_bool(return_value, "started", progress->state.started); - add_property_bool(return_value, "finished", progress->state.finished); - add_property_string(return_value, "info", STR_PTR(progress->state.info), 1); - add_property_double(return_value, "dltotal", progress->state.dl.total); - add_property_double(return_value, "dlnow", progress->state.dl.now); - add_property_double(return_value, "ultotal", progress->state.ul.total); - add_property_double(return_value, "ulnow", progress->state.ul.now); + php_http_client_progress_t *progress = NULL; + + if (SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, &progress)) { + object_init(return_value); + add_property_bool(return_value, "started", progress->state.started); + add_property_bool(return_value, "finished", progress->state.finished); + add_property_string(return_value, "info", STR_PTR(progress->state.info), 1); + add_property_double(return_value, "dltotal", progress->state.dl.total); + add_property_double(return_value, "dlnow", progress->state.dl.now); + add_property_double(return_value, "ultotal", progress->state.ul.total); + add_property_double(return_value, "ulnow", progress->state.ul.now); + } } } @@ -857,7 +717,13 @@ PHP_METHOD(HttpClient, getTransferInfo) PHP_METHOD(HttpClient, setOptions) { - php_http_client_object_set_options(INTERNAL_FUNCTION_PARAM_PASSTHRU); + zval *opts = NULL; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { + php_http_client_options_set(getThis(), opts TSRMLS_CC); + + RETVAL_ZVAL(getThis(), 1, 0); + } } PHP_METHOD(HttpClient, getOptions) @@ -870,32 +736,60 @@ PHP_METHOD(HttpClient, getOptions) PHP_METHOD(HttpClient, setSslOptions) { - php_http_client_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_STRS("ssl"), 1, 0); + zval *opts = NULL; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { + php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 1 TSRMLS_CC); + + RETVAL_ZVAL(getThis(), 1, 0); + } } PHP_METHOD(HttpClient, addSslOptions) { - php_http_client_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_STRS("ssl"), 0, 0); + zval *opts = NULL; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { + php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 0 TSRMLS_CC); + + RETVAL_ZVAL(getThis(), 1, 0); + } } PHP_METHOD(HttpClient, getSslOptions) { - php_http_client_object_get_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_STRS("ssl")); + if (SUCCESS == zend_parse_parameters_none()) { + php_http_client_options_get_subr(getThis(), ZEND_STRS("ssl"), return_value TSRMLS_CC); + } } PHP_METHOD(HttpClient, setCookies) { - php_http_client_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_STRS("cookies"), 1, 0); + zval *opts = NULL; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { + php_http_client_options_set_subr(getThis(), ZEND_STRS("cookies"), opts, 1 TSRMLS_CC); + + RETVAL_ZVAL(getThis(), 1, 0); + } } PHP_METHOD(HttpClient, addCookies) { - php_http_client_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_STRS("cookies"), 0, 0); + zval *opts = NULL; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { + php_http_client_options_set_subr(getThis(), ZEND_STRS("cookies"), opts, 0 TSRMLS_CC); + + RETVAL_ZVAL(getThis(), 1, 0); + } } PHP_METHOD(HttpClient, getCookies) { - php_http_client_object_get_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_STRS("cookies")); + if (SUCCESS == zend_parse_parameters_none()) { + php_http_client_options_get_subr(getThis(), ZEND_STRS("cookies"), return_value TSRMLS_CC); + } } PHP_METHOD(HttpClient, enableCookies) @@ -935,7 +829,7 @@ PHP_METHOD(HttpClient, flushCookies) PHP_METHOD(HttpClient, getResponseMessage) { - with_error_handling(EH_THROW, php_http_exception_class_entry) { + with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { if (SUCCESS == zend_parse_parameters_none()) { zval *message = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("responseMessage"), 0 TSRMLS_CC); @@ -950,7 +844,7 @@ PHP_METHOD(HttpClient, getResponseMessage) PHP_METHOD(HttpClient, getRequestMessage) { - with_error_handling(EH_THROW, php_http_exception_class_entry) { + with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { if (SUCCESS == zend_parse_parameters_none()) { zval *message = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("requestMessage"), 0 TSRMLS_CC); @@ -965,7 +859,7 @@ PHP_METHOD(HttpClient, getRequestMessage) PHP_METHOD(HttpClient, getHistory) { - with_error_handling(EH_THROW, php_http_exception_class_entry) { + with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { if (SUCCESS == zend_parse_parameters_none()) { zval *hist = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("history"), 0 TSRMLS_CC); @@ -986,34 +880,90 @@ PHP_METHOD(HttpClient, clearHistory) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpClient, getMessageClass) +PHP_METHOD(HttpClient, getResponseMessageClass) { if (SUCCESS == zend_parse_parameters_none()) { - RETURN_PROP(php_http_client_class_entry, "messageClass"); + RETURN_PROP(php_http_client_class_entry, "responseMessageClass"); } RETURN_FALSE; } -PHP_METHOD(HttpClient, setMessageClass) +PHP_METHOD(HttpClient, setResponseMessageClass) { char *cn; int cl; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &cn, &cl)) { - zend_update_property_stringl(php_http_client_class_entry, getThis(), ZEND_STRL("messageClass"), cn, cl TSRMLS_CC); + zend_update_property_stringl(php_http_client_class_entry, getThis(), ZEND_STRL("responseMessageClass"), cn, cl TSRMLS_CC); } RETVAL_ZVAL(getThis(), 1, 0); } +PHP_METHOD(HttpClient, setRequest) +{ + zval *zreq = NULL; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zreq, php_http_client_request_get_class_entry())) { + zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("request"), zreq TSRMLS_CC); + } + RETURN_ZVAL(getThis(), 1, 0); +} + +PHP_METHOD(HttpClient, getRequest) +{ + if (SUCCESS == zend_parse_parameters_none()) { + RETURN_PROP(php_http_client_class_entry, "request"); + } +} + +PHP_METHOD(HttpClient, request) +{ + char *meth_str, *url_str; + int meth_len, url_len; + zval *zheader, *zbody, *zoptions; + + with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a!z!a!/", &meth_str, &meth_len, &url_str, &url_len, &zheader, &zbody, &zoptions)) { + php_http_message_object_t *msg_obj; + zend_object_value ov; + zval *req, *res = NULL; + + php_http_new(&ov, php_http_client_request_get_class_entry(), (php_http_new_t) php_http_message_object_new_ex, NULL, NULL, (void *) &msg_obj TSRMLS_CC); + MAKE_STD_ZVAL(req); + ZVAL_OBJVAL(req, ov, 0); + + msg_obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL TSRMLS_CC); + PHP_HTTP_INFO(msg_obj->message).request.url = estrndup(url_str, url_len); + PHP_HTTP_INFO(msg_obj->message).request.method = estrndup(meth_str, meth_len); + + if (zheader) { + array_copy(Z_ARRVAL_P(zheader), &msg_obj->message->hdrs); + } + + if (zbody) { + php_http_message_object_set_body(msg_obj, zbody TSRMLS_CC); + } + + if (zoptions) { + php_http_client_options_set(req, zoptions TSRMLS_CC); + } + + zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "send", &res, req); + RETVAL_ZVAL(res, 0, 1); + zval_ptr_dtor(&req); + } + } end_error_handling(); +} + PHP_METHOD(HttpClient, send) { - zval *zreq; + zval *zreq = NULL; RETVAL_FALSE; - with_error_handling(EH_THROW, php_http_exception_class_entry) { - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zreq, php_http_client_request_class_entry)) { - if (SUCCESS == php_http_client_object_handle_request(getThis(), zreq TSRMLS_CC)) { + with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O!", &zreq, php_http_client_request_get_class_entry())) { + if (SUCCESS == php_http_client_object_handle_request(getThis(), &zreq TSRMLS_CC)) { php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); php_http_message_object_t *req = zend_object_store_get_object(zreq TSRMLS_CC); @@ -1033,21 +983,21 @@ PHP_METHOD(HttpClient, send) PHP_MINIT_FUNCTION(http_client) { - PHP_HTTP_REGISTER_CLASS(http\\Client, AbstractClient, http_client, php_http_object_class_entry, ZEND_ACC_ABSTRACT); - php_http_client_class_entry->create_object = php_http_object_new;//php_http_client_object_new; + PHP_HTTP_REGISTER_CLASS(http\\Client, AbstractClient, http_client, php_http_object_get_class_entry(), ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + php_http_client_class_entry->create_object = php_http_client_object_new; memcpy(&php_http_client_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_client_object_handlers.clone_obj = php_http_client_object_clone; - zend_class_implements(php_http_client_class_entry TSRMLS_CC, 2, spl_ce_SplSubject, php_http_client_interface_class_entry); + zend_class_implements(php_http_client_class_entry TSRMLS_CC, 2, spl_ce_SplSubject, php_http_client_interface_get_class_entry()); - zend_declare_property_string(php_http_client_class_entry, ZEND_STRL("messageClass"), "", ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_string(php_http_client_class_entry, ZEND_STRL("responseMessageClass"), "", ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("observers"), ZEND_ACC_PRIVATE TSRMLS_CC); - zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("options"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("transferInfo"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("responseMessage"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("requestMessage"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("history"), ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED TSRMLS_CC); zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("request"), ZEND_ACC_PROTECTED TSRMLS_CC); zend_declare_property_bool(php_http_client_class_entry, ZEND_STRL("recordHistory"), 0, ZEND_ACC_PUBLIC TSRMLS_CC);