X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_functions.c;h=ad2e3d2419616385a7c344c9189ab0b69e0600e9;hb=28676404f30a0814a8e027d63b3cec4959475c46;hp=1c63ba0d6b270f57dbe2a01a28d012e44b98fb59;hpb=60086d086e7f0dbfccf61931c1b2e2b410ccb5bb;p=m6w6%2Fext-http diff --git a/http_functions.c b/http_functions.c index 1c63ba0..ad2e3d2 100644 --- a/http_functions.c +++ b/http_functions.c @@ -250,7 +250,7 @@ PHP_FUNCTION(http_build_str) zval **value; \ \ zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported)); \ - if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void **) &value)) { \ + if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void *) &value)) { \ RETVAL_ZVAL(*value, 1, 0); \ } else { \ RETVAL_NULL(); \ @@ -1034,6 +1034,7 @@ PHP_FUNCTION(http_parse_headers) array_init(return_value); if (SUCCESS != http_parse_headers(header, return_value)) { zval_dtor(return_value); + http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse headers"); RETURN_FALSE; } } @@ -1206,7 +1207,7 @@ PHP_FUNCTION(http_match_request_header) 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)) { \ + 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) { \ @@ -1230,6 +1231,7 @@ PHP_FUNCTION(http_match_request_header) * redirects to a different host * - proxyhost: string, proxy host in "host[:port]" format * - proxyport: int, use another proxy port as specified in proxyhost + * - proxytype: int, HTTP_PROXY_HTTP, SOCKS4 or SOCKS5 * - proxyauth: string, proxy credentials in "user:pass" format * - proxyauthtype: int, HTTP_AUTH_BASIC and/or HTTP_AUTH_NTLM * - httpauth: string, http credentials in "user:pass" format @@ -1249,6 +1251,9 @@ PHP_FUNCTION(http_match_request_header) * - cookiesession: bool, accept (true) or reset (false) sessioncookies * - resume: int, byte offset to start the download from; * if the server supports ranges + * - range: array, array of arrays, each containing two integers, + * specifying the ranges to download if server support is + * given; only recognized if the resume option is empty * - maxfilesize: int, maximum file size that should be downloaded; * has no effect, if the size of the requested entity is not known * - lastmodified: int, timestamp for If-(Un)Modified-Since header @@ -1502,7 +1507,7 @@ PHP_FUNCTION(http_put_file) RETURN_FALSE; } - if (!(stream = php_stream_open_wrapper(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL))) { + if (!(stream = php_stream_open_wrapper_ex(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT))) { RETURN_FALSE; } if (php_stream_stat(stream, &ssb)) { @@ -1517,12 +1522,8 @@ PHP_FUNCTION(http_put_file) RETVAL_FALSE; - body.type = HTTP_REQUEST_BODY_UPLOADFILE; - body.data = stream; - body.size = ssb.sb.st_size; - http_request_init_ex(&request, NULL, HTTP_PUT, URL); - request.body = &body; + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1); if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { http_request_exec(&request); if (info) { @@ -1530,8 +1531,6 @@ PHP_FUNCTION(http_put_file) } RETVAL_RESPONSE_OR_BODY(request); } - http_request_body_dtor(&body); - request.body = NULL; http_request_dtor(&request); } /* }}} */ @@ -1544,7 +1543,7 @@ PHP_FUNCTION(http_put_file) * opened stream, from which the data to upload should be read. * See http_get() for a full list of available options. * - * Returns the HTTP response(s) as string on success. or FALSE on failure. + * Returns the HTTP response(s) as string on success, or FALSE on failure. */ PHP_FUNCTION(http_put_stream) { @@ -1572,12 +1571,49 @@ PHP_FUNCTION(http_put_stream) RETVAL_FALSE; - body.type = HTTP_REQUEST_BODY_UPLOADFILE; - body.data = stream; - body.size = ssb.sb.st_size; + http_request_init_ex(&request, NULL, HTTP_PUT, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 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); +} +/* }}} */ - http_request_init_ex(&request, NULL, HTTP_POST, URL); - request.body = &body; +/* {{{ proto string http_put_data(string url, string data[, array options[, array &info]]) + * + * Performs an HTTP PUT request on the supplied url. + * + * Expects the second parameter to be a string containing the data to upload. + * See http_get() for a full list of available options. + * + * Returns the HTTP response(s) as string on success, or FALSE on failure. + */ +PHP_FUNCTION(http_put_data) +{ + char *URL, *data; + int URL_len, data_len; + zval *options = NULL, *info = NULL; + http_request_body body; + http_request request; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &data, &data_len, &options, &info)) { + RETURN_FALSE; + } + + if (info) { + zval_dtor(info); + array_init(info); + } + + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_PUT, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_len, 0); if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { http_request_exec(&request); if (info) { @@ -1585,10 +1621,147 @@ PHP_FUNCTION(http_put_stream) } RETVAL_RESPONSE_OR_BODY(request); } - request.body = NULL; http_request_dtor(&request); } /* }}} */ + +/* {{{ proto string http_request(int method, string url[, string body[, array options[, array &info]]]) + * + * Performs a custom HTTP request on the supplied url. + * + * Expects the first parameter to be an integer specifying the request method to use. + * Accepts an optional third string parameter containing the raw request body. + * See http_get() for a full list of available options. + * + * Returns the HTTP response(s) as string on success, or FALSE on failure. + */ +PHP_FUNCTION(http_request) +{ + long meth; + char *URL, *data = NULL; + int URL_len, data_len = 0; + zval *options = NULL, *info = NULL; + http_request_body body; + http_request request; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls|sa/!z", &meth, &URL, &URL_len, &data, &data_len, &options, &info)) { + RETURN_FALSE; + } + + if (info) { + zval_dtor(info); + array_init(info); + } + + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, meth, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_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); +} +/* }}} */ + +static char *file_get_contents(char *file, size_t *len TSRMLS_DC) +{ + php_stream *s = NULL; + char *buf = NULL; + + if ((s = php_stream_open_wrapper_ex(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT))) { + *len = php_stream_copy_to_mem(s, &buf, (size_t) -1, 0); + php_stream_close(s); + } else { + *len = 0; + } + return buf; +} +struct FormData { + struct FormData *next; + int type; + char *line; + size_t length; +}; +CURLcode Curl_getFormData(struct FormData **, struct curl_httppost *post, curl_off_t *size); + +/* {{{ proto string http_request_body_encode(array fields, array files) + * + * Generate x-www-form-urlencoded resp. form-data encoded request body. + * + * Returns encoded string on success, or FALSE on failure. + */ +PHP_FUNCTION(http_request_body_encode) +{ + zval *fields = NULL, *files = NULL; + HashTable *fields_ht, *files_ht; + http_request_body body; + phpstr rbuf; + struct FormData *data, *ptr; + curl_off_t size; + char *fdata = NULL; + size_t fsize = 0; + CURLcode rc; + int fgc_error = 0; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!", &fields, &files)) { + RETURN_FALSE; + } + + fields_ht = (fields && Z_TYPE_P(fields) == IS_ARRAY) ? Z_ARRVAL_P(fields) : NULL; + files_ht = (files && Z_TYPE_P(files) == IS_ARRAY) ? Z_ARRVAL_P(files) : NULL; + if (!http_request_body_fill(&body, fields_ht, files_ht)) { + RETURN_FALSE; + } + + switch (body.type) + { + case HTTP_REQUEST_BODY_CURLPOST: + if (CURLE_OK != (rc = Curl_getFormData(&data, body.data, &size))) { + http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Could not encode request body: %s", curl_easy_strerror(rc)); + RETVAL_FALSE; + } else { + phpstr_init_ex(&rbuf, (size_t) size, PHPSTR_INIT_PREALLOC); + for (ptr = data; ptr; ptr = ptr->next) { + if (!fgc_error) { + if (ptr->type) { + if ((fdata = file_get_contents(ptr->line, &fsize TSRMLS_CC))) { + phpstr_append(&rbuf, fdata, fsize); + efree(fdata); + } else { + fgc_error = 1; + } + } else { + phpstr_append(&rbuf, ptr->line, ptr->length); + } + } + curl_free(ptr->line); + } + curl_free(data); + if (fgc_error) { + phpstr_dtor(&rbuf); + RETVAL_FALSE; + } else { + RETVAL_PHPSTR_VAL(&rbuf); + } + } + http_request_body_dtor(&body); + break; + + case HTTP_REQUEST_BODY_CSTRING: + RETVAL_STRINGL(body.data, body.size, 0); + break; + + default: + http_request_body_dtor(&body); + RETVAL_FALSE; + break; + } +} #endif /* HTTP_HAVE_CURL */ /* }}} HAVE_CURL */