X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=5987681a73d2dcbaa7bfbe39782dfe2d62a7eb7b;hp=5887bf29e9032a133d1e58bd63c330764ede6e37;hb=e47ee304be6758fbbfd238476f8a6bda9090fe12;hpb=4a881fb37338bfeacd40c42a97f334c9faed299a diff --git a/http_request_object.c b/http_request_object.c index 5887bf2..5987681 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -31,6 +31,12 @@ #include "php_http_std_defs.h" #include "php_http_request_object.h" +#include "php_http_request_api.h" +#include "php_http_request_pool_api.h" +#include "php_http_api.h" +#include "php_http_url_api.h" +#include "php_http_message_api.h" +#include "php_http_message_object.h" #ifdef ZEND_ENGINE_2 #ifdef HTTP_HAVE_CURL @@ -71,15 +77,20 @@ zend_function_entry http_request_object_fe[] = { PHP_ME(HttpRequest, addQueryData, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpRequest, unsetQueryData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, setPostData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getPostData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, addPostData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, unsetPostData, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, setPostFields, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, getPostFields, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, addPostFields, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, unsetPostFields, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, setPostFiles, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpRequest, addPostFile, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpRequest, getPostFiles, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpRequest, unsetPostFiles, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, setPutFile, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, getPutFile, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, unsetPutFile, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, send, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpRequest, getResponseData, NULL, ZEND_ACC_PUBLIC) @@ -88,6 +99,7 @@ zend_function_entry http_request_object_fe[] = { PHP_ME(HttpRequest, getResponseCode, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpRequest, getResponseBody, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpRequest, getResponseInfo, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, getResponseMessage, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; @@ -96,9 +108,40 @@ static zend_object_handlers http_request_object_handlers; void _http_request_object_init(INIT_FUNC_ARGS) { HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0); + + /* HTTP/1.1 */ HTTP_LONG_CONSTANT("HTTP_GET", HTTP_GET); HTTP_LONG_CONSTANT("HTTP_HEAD", HTTP_HEAD); HTTP_LONG_CONSTANT("HTTP_POST", HTTP_POST); + HTTP_LONG_CONSTANT("HTTP_PUT", HTTP_PUT); + HTTP_LONG_CONSTANT("HTTP_DELETE", HTTP_DELETE); + HTTP_LONG_CONSTANT("HTTP_OPTIONS", HTTP_OPTIONS); + HTTP_LONG_CONSTANT("HTTP_TRACE", HTTP_TRACE); + HTTP_LONG_CONSTANT("HTTP_CONNECT", HTTP_CONNECT); + /* WebDAV - RFC 2518 */ + HTTP_LONG_CONSTANT("HTTP_PROPFIND", HTTP_PROPFIND); + HTTP_LONG_CONSTANT("HTTP_PROPPATCH", HTTP_PROPPATCH); + HTTP_LONG_CONSTANT("HTTP_MKCOL", HTTP_MKCOL); + HTTP_LONG_CONSTANT("HTTP_COPY", HTTP_COPY); + HTTP_LONG_CONSTANT("HTTP_MOVE", HTTP_MOVE); + HTTP_LONG_CONSTANT("HTTP_LOCK", HTTP_LOCK); + HTTP_LONG_CONSTANT("HTTP_UNLOCK", HTTP_UNLOCK); + /* WebDAV Versioning - RFC 3253 */ + HTTP_LONG_CONSTANT("HTTP_VERSION_CONTROL", HTTP_VERSION_CONTROL); + HTTP_LONG_CONSTANT("HTTP_REPORT", HTTP_REPORT); + HTTP_LONG_CONSTANT("HTTP_CHECKOUT", HTTP_CHECKOUT); + HTTP_LONG_CONSTANT("HTTP_CHECKIN", HTTP_CHECKIN); + HTTP_LONG_CONSTANT("HTTP_UNCHECKOUT", HTTP_UNCHECKOUT); + HTTP_LONG_CONSTANT("HTTP_MKWORKSPACE", HTTP_MKWORKSPACE); + HTTP_LONG_CONSTANT("HTTP_UPDATE", HTTP_UPDATE); + HTTP_LONG_CONSTANT("HTTP_LABEL", HTTP_LABEL); + HTTP_LONG_CONSTANT("HTTP_MERGE", HTTP_MERGE); + HTTP_LONG_CONSTANT("HTTP_BASELINE_CONTROL", HTTP_BASELINE_CONTROL); + HTTP_LONG_CONSTANT("HTTP_MKACTIVITY", HTTP_MKACTIVITY); + /* WebDAV Access Control - RFC 3744 */ + HTTP_LONG_CONSTANT("HTTP_ACL", HTTP_ACL); + + # if LIBCURL_VERSION_NUM >= 0x070a05 HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC); HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST); @@ -114,6 +157,9 @@ zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC) o = ecalloc(1, sizeof(http_request_object)); o->zo.ce = ce; o->ch = curl_easy_init(); + o->pool = NULL; + + phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0); ALLOC_HASHTABLE(OBJ_PROP(o)); zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); @@ -132,7 +178,9 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D) DCL_PROP_N(PROTECTED, options); DCL_PROP_N(PROTECTED, responseInfo); DCL_PROP_N(PROTECTED, responseData); - DCL_PROP_N(PROTECTED, postData); + DCL_PROP_N(PROTECTED, responseCode); + DCL_PROP_N(PROTECTED, responseMessage); + DCL_PROP_N(PROTECTED, postFields); DCL_PROP_N(PROTECTED, postFiles); DCL_PROP(PROTECTED, long, method, HTTP_GET); @@ -140,7 +188,7 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D) DCL_PROP(PROTECTED, string, url, ""); DCL_PROP(PROTECTED, string, contentType, ""); DCL_PROP(PROTECTED, string, queryData, ""); - DCL_PROP(PROTECTED, string, postData, ""); + DCL_PROP(PROTECTED, string, putFile, ""); } void _http_request_object_free(zend_object *object TSRMLS_DC) @@ -153,11 +201,135 @@ void _http_request_object_free(zend_object *object TSRMLS_DC) } if (o->ch) { curl_easy_cleanup(o->ch); - o->ch = NULL; } + phpstr_dtor(&o->response); efree(o); } +STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr, http_request_body *body TSRMLS_DC) +{ + zval *meth, *URL, *qdata, *opts; + char *request_uri; + STATUS status; + + if (!body) { + return FAILURE; + } + if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) { + http_error(E_WARNING, HTTP_E_CURL, "Could not initilaize curl"); + return FAILURE; + } + + meth = GET_PROP(obj, method); + URL = GET_PROP(obj, url); + qdata = GET_PROP(obj, queryData); + opts = GET_PROP(obj, options); + + // HTTP_URI_MAXLEN+1 long char * + if (!(request_uri = http_absolute_uri_ex(Z_STRVAL_P(URL), Z_STRLEN_P(URL), NULL, 0, NULL, 0, 0))) { + return FAILURE; + } + + if (Z_STRLEN_P(qdata) && (strlen(request_uri) < HTTP_URI_MAXLEN)) { + if (!strchr(request_uri, '?')) { + strcat(request_uri, "?"); + } else { + strcat(request_uri, "&"); + } + strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri)); + } + + 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); + break; + + case HTTP_PUT: + { + php_stream *stream; + php_stream_statbuf ssb; + zval *file = GET_PROP(obj, putFile); + + if ( (stream = php_stream_open_wrapper(Z_STRVAL_P(file), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL)) && + !php_stream_stat(stream, &ssb)) { + body->type = HTTP_REQUEST_BODY_UPLOADFILE; + 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); + } else { + status = FAILURE; + } + } + break; + + case HTTP_POST: + { + 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); + } + } + break; + + default: + { + zval *post = GET_PROP(obj, postData); + + body->type = HTTP_REQUEST_BODY_CSTRING; + 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); + } + break; + } + + efree(request_uri); + return status; +} + +STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC) +{ + http_message *msg; + + phpstr_fix(&obj->response); + + 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); + + UPD_PROP(obj, long, responseCode, msg->info.response.code); + + MAKE_STD_ZVAL(headers) + array_init(headers); + + zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + phpstr_data(PHPSTR(msg), &body, &body_len); + + add_assoc_zval(resp, "headers", headers); + add_assoc_stringl(resp, "body", body, body_len, 0); + + MAKE_STD_ZVAL(message); + message->type = IS_OBJECT; + message->is_ref = 1; + message->value.obj = http_message_object_from_msg(msg); + SET_PROP(obj, responseMessage, message); + zval_ptr_dtor(&message); + + http_request_info(obj->ch, Z_ARRVAL_P(info)); + SET_PROP(obj, responseInfo, info); + + return SUCCESS; + } + return FAILURE; +} + #endif /* HTTP_HAVE_CURL */ #endif /* ZEND_ENGINE_2 */