X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client_request.c;h=0e40cc5bc930778620321479e570da865b4686ac;hp=db8ef51f318fed893de7a88ca4ff34375fef25ff;hb=791511f3bc18cdc68b3f27b43d9396cf56d99e5a;hpb=9886ab46dbb299c9d6cfef9d8a0258d91b90a8e6 diff --git a/php_http_client_request.c b/php_http_client_request.c index db8ef51..0e40cc5 100644 --- a/php_http_client_request.c +++ b/php_http_client_request.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2013, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -16,6 +16,13 @@ void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zva void php_http_client_options_set(zval *this_ptr, zval *opts TSRMLS_DC); void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value TSRMLS_DC); +#define PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj) \ + do { \ + if (!obj->message) { \ + obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL TSRMLS_CC); \ + } \ + } while(0) + ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest___construct, 0, 0, 0) ZEND_ARG_INFO(0, method) ZEND_ARG_INFO(0, url) @@ -24,34 +31,33 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest___construct, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientRequest, __construct) { - char *meth_str = NULL, *url_str = NULL; - int meth_len = 0, url_len = 0; - zval *zheaders = NULL, *zbody = NULL; - - with_error_handling(EH_THROW, php_http_exception_class_entry) { - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!a!O!", &meth_str, &meth_len, &url_str, &url_len, &zheaders, &zbody, php_http_message_body_class_entry)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - - if (obj->message) { - php_http_message_set_type(obj->message, PHP_HTTP_REQUEST); - } else { - obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL TSRMLS_CC); - } - - if (zbody) { - php_http_message_object_set_body(obj, zbody TSRMLS_CC); - } - if (meth_str && meth_len) { - PHP_HTTP_INFO(obj->message).request.method = estrndup(meth_str, meth_len); - } - if (url_str && url_len) { - PHP_HTTP_INFO(obj->message).request.url = estrndup(url_str, url_len); - } - if (zheaders) { - array_copy(Z_ARRVAL_P(zheaders), &obj->message->hdrs); - } - } - } end_error_handling(); + char *meth_str = NULL; + int meth_len = 0; + zval *zheaders = NULL, *zbody = NULL, *zurl = NULL; + php_http_message_object_t *obj; + + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!z!a!O!", &meth_str, &meth_len, &zurl, &zheaders, &zbody, php_http_message_body_class_entry), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->message) { + php_http_message_set_type(obj->message, PHP_HTTP_REQUEST); + } else { + obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL TSRMLS_CC); + } + + if (zbody) { + php_http_expect(SUCCESS == php_http_message_object_set_body(obj, zbody TSRMLS_CC), unexpected_val, return); + } + if (meth_str && meth_len) { + PHP_HTTP_INFO(obj->message).request.method = estrndup(meth_str, meth_len); + } + if (zurl) { + PHP_HTTP_INFO(obj->message).request.url = php_http_url_from_zval(zurl, ~0 TSRMLS_CC); + } + if (zheaders) { + array_copy(Z_ARRVAL_P(zheaders), &obj->message->hdrs); + } } ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_setContentType, 0, 0, 1) @@ -61,23 +67,24 @@ static PHP_METHOD(HttpClientRequest, setContentType) { char *ct_str; int ct_len; + php_http_message_object_t *obj; + zval *zct; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ct_str, &ct_len)) { - int invalid = 0; + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ct_str, &ct_len), invalid_arg, return); - if (ct_len) { - PHP_HTTP_CHECK_CONTENT_TYPE(ct_str, invalid = 1); - } + if (ct_len && !strchr(ct_str, '/')) { + php_http_throw(unexpected_val, "Content type \"%s\" does not seem to contain a primary and a secondary part", ct_str); + return; + } - if (!invalid) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - zval *zct; + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj); + + MAKE_STD_ZVAL(zct); + ZVAL_STRINGL(zct, ct_str, ct_len, 1); + zend_hash_update(&obj->message->hdrs, "Content-Type", sizeof("Content-Type"), (void *) &zct, sizeof(void *), NULL); - MAKE_STD_ZVAL(zct); - ZVAL_STRINGL(zct, ct_str, ct_len, 1); - zend_hash_update(&obj->message->hdrs, "Content-Type", sizeof("Content-Type"), (void *) &zct, sizeof(void *), NULL); - } - } RETVAL_ZVAL(getThis(), 1, 0); } @@ -89,6 +96,8 @@ static PHP_METHOD(HttpClientRequest, getContentType) php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); zval *zct; + PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj); + php_http_message_update_headers(obj->message); zct = php_http_message_header(obj->message, ZEND_STRL("Content-Type"), 1); if (zct) { @@ -103,41 +112,48 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientRequest, setQuery) { zval *qdata = NULL; + php_http_message_object_t *obj; + php_http_url_t *old_url = NULL, new_url = {NULL}; + char empty[] = ""; + unsigned flags = PHP_HTTP_URL_REPLACE; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!", &qdata)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - php_url *old_url = NULL, new_url = {NULL}; - char empty[] = ""; + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!", &qdata), invalid_arg, return); - if (qdata) { - zval arr, str; + obj = zend_object_store_get_object(getThis() TSRMLS_CC); - INIT_PZVAL(&arr); - array_init(&arr); - INIT_PZVAL(&str); - ZVAL_NULL(&str); + PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj); - php_http_querystring_update(&arr, qdata, &str TSRMLS_CC); - new_url.query = Z_STRVAL(str); - zval_dtor(&arr); - } else { - new_url.query = &empty[0]; - } + if (qdata) { + zval arr, str; - if (obj->message->http.info.request.url) { - old_url = php_url_parse(obj->message->http.info.request.url); - efree(obj->message->http.info.request.url); - } + INIT_PZVAL(&arr); + array_init(&arr); + INIT_PZVAL(&str); + ZVAL_NULL(&str); + + php_http_expect(SUCCESS == php_http_querystring_update(&arr, qdata, &str TSRMLS_CC), bad_querystring, + zval_dtor(&arr); + return; + ); + new_url.query = Z_STRVAL(str); + zval_dtor(&arr); + } else { + flags = PHP_HTTP_URL_STRIP_QUERY; + } - php_http_url(PHP_HTTP_URL_REPLACE, old_url, &new_url, NULL, &obj->message->http.info.request.url, NULL TSRMLS_CC); + if (obj->message->http.info.request.url) { + old_url = obj->message->http.info.request.url; + } - if (old_url) { - php_url_free(old_url); - } - if (new_url.query != &empty[0]) { - STR_FREE(new_url.query); - } + obj->message->http.info.request.url = php_http_url_mod(old_url, &new_url, flags TSRMLS_CC); + + if (old_url) { + php_http_url_free(&old_url); + } + if (new_url.query != &empty[0]) { + PTR_FREE(new_url.query); } + RETVAL_ZVAL(getThis(), 1, 0); } @@ -148,16 +164,10 @@ static PHP_METHOD(HttpClientRequest, getQuery) if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (obj->message->http.info.request.url) { - php_url *purl = php_url_parse(obj->message->http.info.request.url); + PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj); - if (purl) { - if (purl->query) { - RETVAL_STRING(purl->query, 0); - purl->query = NULL; - } - php_url_free(purl); - } + if (obj->message->http.info.request.url && obj->message->http.info.request.url->query) { + RETVAL_STRING(obj->message->http.info.request.url->query, 1); } } } @@ -167,35 +177,39 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_addQuery, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientRequest, addQuery) { - zval *qdata; + zval *qdata, arr, str; + php_http_message_object_t *obj; + php_http_url_t *old_url = NULL, new_url = {NULL}; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &qdata)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - php_url *old_url = NULL, new_url = {NULL}; + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &qdata), invalid_arg, return); - zval arr, str; + obj = zend_object_store_get_object(getThis() TSRMLS_CC); - INIT_PZVAL(&arr); - array_init(&arr); - INIT_PZVAL(&str); - ZVAL_NULL(&str); + PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj); - php_http_querystring_update(&arr, qdata, &str TSRMLS_CC); - new_url.query = Z_STRVAL(str); - zval_dtor(&arr); + INIT_PZVAL(&arr); + array_init(&arr); + INIT_PZVAL(&str); + ZVAL_NULL(&str); - if (obj->message->http.info.request.url) { - old_url = php_url_parse(obj->message->http.info.request.url); - efree(obj->message->http.info.request.url); - } + php_http_expect(SUCCESS == php_http_querystring_update(&arr, qdata, &str TSRMLS_CC), bad_querystring, + zval_dtor(&arr); + return; + ); + new_url.query = Z_STRVAL(str); + zval_dtor(&arr); - php_http_url(PHP_HTTP_URL_JOIN_QUERY, old_url, &new_url, NULL, &obj->message->http.info.request.url, NULL TSRMLS_CC); + if (obj->message->http.info.request.url) { + old_url = obj->message->http.info.request.url; + } - if (old_url) { - php_url_free(old_url); - } - STR_FREE(new_url.query); + obj->message->http.info.request.url = php_http_url_mod(old_url, &new_url, PHP_HTTP_URL_JOIN_QUERY TSRMLS_CC); + + if (old_url) { + php_http_url_free(&old_url); } + PTR_FREE(new_url.query); + RETVAL_ZVAL(getThis(), 1, 0); } @@ -206,11 +220,11 @@ static PHP_METHOD(HttpClientRequest, setOptions) { zval *opts = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { - php_http_client_options_set(getThis(), opts TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); - RETVAL_ZVAL(getThis(), 1, 0); - } + php_http_client_options_set(getThis(), opts TSRMLS_CC); + + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_getOptions, 0, 0, 0) @@ -221,7 +235,6 @@ static PHP_METHOD(HttpClientRequest, getOptions) zval *zoptions = zend_read_property(php_http_client_request_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); RETURN_ZVAL(zoptions, 1, 0); } - RETURN_FALSE; } ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_setSslOptions, 0, 0, 0) @@ -231,11 +244,11 @@ static PHP_METHOD(HttpClientRequest, setSslOptions) { 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); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); - RETVAL_ZVAL(getThis(), 1, 0); - } + php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 1 TSRMLS_CC); + + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_addSslOptions, 0, 0, 0) @@ -245,11 +258,11 @@ static PHP_METHOD(HttpClientRequest, addSslOptions) { 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); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); - RETVAL_ZVAL(getThis(), 1, 0); - } + php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 0 TSRMLS_CC); + + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_getSslOptions, 0, 0, 0)