X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=inline;f=http_functions.c;h=279e4ea02e97777d76feb1a820944bd9b9dd0f11;hb=649aada485583ccac67928e0700cb5f1b963f4e8;hp=c094e640a56d11c918ed9e4d3156492a1286f78f;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb;p=m6w6%2Fext-http diff --git a/http_functions.c b/http_functions.c index c094e64..279e4ea 100644 --- a/http_functions.c +++ b/http_functions.c @@ -79,7 +79,7 @@ PHP_FUNCTION(http_date) * If a port is pecified in either the url or as sperate parameter, * it will be added if it differs from te default port for HTTP(S). * - * Returns the absolute URI as string. + * Returns the absolute URI as string on success or false on failure. * * Examples: *
@@ -90,7 +90,7 @@ PHP_FUNCTION(http_date) */ PHP_FUNCTION(http_build_uri) { - char *url = NULL, *proto = NULL, *host = NULL; + char *url = NULL, *proto = NULL, *host = NULL, *built = NULL; int url_len = 0, proto_len = 0, host_len = 0; long port = 0; @@ -98,7 +98,10 @@ PHP_FUNCTION(http_build_uri) RETURN_FALSE; } - RETURN_STRING(http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port), 0); + if ((built = http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port))) { + RETURN_STRING(built, 0); + } + RETURN_FALSE; } /* }}} */ @@ -974,6 +977,23 @@ PHP_FUNCTION(http_match_request_header) /* {{{ HAVE_CURL */ #ifdef HTTP_HAVE_CURL +#define RETVAL_RESPONSE_OR_BODY(request) \ + { \ + zval **bodyonly; \ + \ + /* check if only the body should be returned */ \ + if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void **) &bodyonly)) && zval_is_true(*bodyonly)) { \ + http_message *msg = http_message_parse(PHPSTR_VAL(&request.conv.response), PHPSTR_LEN(&request.conv.response)); \ + \ + if (msg) { \ + RETVAL_STRINGL(PHPSTR_VAL(&msg->body), PHPSTR_LEN(&msg->body), 1); \ + http_message_free(&msg); \ + } \ + } else { \ + RETVAL_STRINGL(request.conv.response.data, request.conv.response.used, 1); \ + } \ + } + /* {{{ proto string http_get(string url[, array options[, array &info]]) * * Performs an HTTP GET request on the supplied url. @@ -1050,7 +1070,7 @@ PHP_FUNCTION(http_get) zval *options = NULL, *info = NULL; char *URL; int URL_len; - phpstr response; + http_request request; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) { RETURN_FALSE; @@ -1061,13 +1081,17 @@ PHP_FUNCTION(http_get) array_init(info); } - phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); - if (SUCCESS == http_get(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETURN_PHPSTR_VAL(&response); - } else { - phpstr_dtor(&response); - RETURN_FALSE; + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_GET, URL); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); } + http_request_dtor(&request); } /* }}} */ @@ -1084,7 +1108,7 @@ PHP_FUNCTION(http_head) zval *options = NULL, *info = NULL; char *URL; int URL_len; - phpstr response; + http_request request; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) { RETURN_FALSE; @@ -1095,13 +1119,17 @@ PHP_FUNCTION(http_head) array_init(info); } - phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); - if (SUCCESS == http_head(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETURN_PHPSTR_VAL(&response); - } else { - phpstr_dtor(&response); - RETURN_FALSE; + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_HEAD, URL); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); } + http_request_dtor(&request); } /* }}} */ @@ -1119,8 +1147,8 @@ PHP_FUNCTION(http_post_data) zval *options = NULL, *info = NULL; char *URL, *postdata; int postdata_len, URL_len; - phpstr response; http_request_body body; + http_request request; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &postdata, &postdata_len, &options, &info) != SUCCESS) { RETURN_FALSE; @@ -1131,17 +1159,18 @@ PHP_FUNCTION(http_post_data) array_init(info); } - body.type = HTTP_REQUEST_BODY_CSTRING; - body.data = postdata; - body.size = postdata_len; + RETVAL_FALSE; - phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); - if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETVAL_PHPSTR_VAL(&response); - } else { - phpstr_dtor(&response); - RETVAL_FALSE; + http_request_init_ex(&request, NULL, HTTP_POST, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, postdata, postdata_len, 0); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); } + http_request_dtor(&request); } /* }}} */ @@ -1159,14 +1188,14 @@ PHP_FUNCTION(http_post_fields) zval *options = NULL, *info = NULL, *fields, *files = NULL; char *URL; int URL_len; - phpstr response; http_request_body body; + http_request request; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|aa/!z", &URL, &URL_len, &fields, &files, &options, &info) != SUCCESS) { RETURN_FALSE; } - if (SUCCESS != http_request_body_fill(&body, Z_ARRVAL_P(fields), files ? Z_ARRVAL_P(files) : NULL)) { + if (!http_request_body_fill(&body, Z_ARRVAL_P(fields), files ? Z_ARRVAL_P(files) : NULL)) { RETURN_FALSE; } @@ -1175,14 +1204,18 @@ PHP_FUNCTION(http_post_fields) array_init(info); } - phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); - if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETVAL_PHPSTR_VAL(&response); - } else { - phpstr_dtor(&response); - RETVAL_FALSE; + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_POST, URL); + request.body = &body; + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); } - http_request_body_dtor(&body); + http_request_dtor(&request); } /* }}} */ @@ -1200,10 +1233,10 @@ PHP_FUNCTION(http_put_file) char *URL, *file; int URL_len, f_len; zval *options = NULL, *info = NULL; - phpstr response; php_stream *stream; php_stream_statbuf ssb; http_request_body body; + http_request request; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &file, &f_len, &options, &info)) { RETURN_FALSE; @@ -1222,18 +1255,24 @@ PHP_FUNCTION(http_put_file) array_init(info); } + RETVAL_FALSE; + body.type = HTTP_REQUEST_BODY_UPLOADFILE; body.data = stream; body.size = ssb.sb.st_size; - phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); - if (SUCCESS == http_put(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETVAL_PHPSTR_VAL(&response); - } else { - phpstr_dtor(&response); - RETVAL_FALSE; + http_request_init_ex(&request, NULL, HTTP_PUT, URL); + request.body = &body; + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); } http_request_body_dtor(&body); + request.body = NULL; + http_request_dtor(&request); } /* }}} */ @@ -1252,10 +1291,10 @@ PHP_FUNCTION(http_put_stream) zval *resource, *options = NULL, *info = NULL; char *URL; int URL_len; - phpstr response; php_stream *stream; php_stream_statbuf ssb; http_request_body body; + http_request request; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sr|a/!z", &URL, &URL_len, &resource, &options, &info)) { RETURN_FALSE; @@ -1271,17 +1310,23 @@ PHP_FUNCTION(http_put_stream) array_init(info); } + RETVAL_FALSE; + body.type = HTTP_REQUEST_BODY_UPLOADFILE; body.data = stream; body.size = ssb.sb.st_size; - phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); - if (SUCCESS == http_put(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETURN_PHPSTR_VAL(&response); - } else { - phpstr_dtor(&response); - RETURN_NULL(); + http_request_init_ex(&request, NULL, HTTP_POST, URL); + request.body = &body; + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); } + request.body = NULL; + http_request_dtor(&request); } /* }}} */ #endif /* HTTP_HAVE_CURL */