X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client.c;h=de09590ffd23d2a1b1f968cc9b82f11d5dc00a6d;hp=6f1c5fae4beeb3235fdbade03d103d704059a432;hb=305ac2f007710b684d96b05f33964b4f6a4e3e4d;hpb=bd80b17b026a00a254ee8693cd7bacf1ebdec4cf diff --git a/php_http_client.c b/php_http_client.c index 6f1c5fa..de09590 100644 --- a/php_http_client.c +++ b/php_http_client.c @@ -29,9 +29,13 @@ PHP_HTTP_API php_http_client_t *php_http_client_init(php_http_client_t *h, php_h } else if (ops->rsrc) { h->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); + 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 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 TSRMLS_CC); TSRMLS_SET_CTX(h->ts); @@ -56,9 +60,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) @@ -88,9 +96,14 @@ PHP_HTTP_API php_http_client_t *php_http_client_copy(php_http_client_t *from, ph } 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 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 TSRMLS_CC); TSRMLS_SET_CTX(to->ts); @@ -197,6 +210,13 @@ 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; @@ -239,6 +259,8 @@ static zend_function_entry php_http_client_method_entry[] = { 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 }; @@ -274,8 +296,11 @@ zend_object_value php_http_client_object_new_ex(zend_class_entry *ce, php_http_c o = ecalloc(1, sizeof(*o)); zend_object_std_init((zend_object *) o, ce TSRMLS_CC); +#if PHP_VERSION_ID < 50339 + zend_hash_copy(((zend_object *) o)->properties, &(ce->default_properties), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval*)); +#else object_properties_init((zend_object *) o, ce); - +#endif ov.handle = zend_objects_store_put(o, NULL, php_http_client_object_free, NULL TSRMLS_CC); ov.handlers = &php_http_client_object_handlers; @@ -349,7 +374,7 @@ STATUS php_http_client_object_handle_request(zval *zclient, zval **zreq TSRMLS_D php_http_client_reset(obj->client); /* reset transfer info */ - zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("info") TSRMLS_CC); + zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("transferInfo") TSRMLS_CC); /* set client options */ zoptions = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("options"), 0 TSRMLS_CC); @@ -396,8 +421,8 @@ 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)) { + /* FIXME: update history */ 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); @@ -422,8 +447,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 TSRMLS_CC); } else { zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("responseMessage") TSRMLS_CC); } @@ -431,19 +455,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; + 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_message_object_new_ex(php_http_message_get_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); + /* update the actual request message */ + MAKE_STD_ZVAL(message); + ZVAL_OBJVAL(message, php_http_message_object_new_ex(php_http_message_get_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); + obj->client->request.message = php_http_message_init(NULL, 0 TSRMLS_CC); + } } if (SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, &progress)) { @@ -889,6 +911,46 @@ PHP_METHOD(HttpClient, getRequest) } } +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_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + 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 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 = NULL;