X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_functions.c;h=afe6f85f6a6ec5f78225f9918feacea486d0d092;hb=bb6571e22d14c87114eb729145be2e7b87ebea42;hp=96f327788c081a0e4aac36ed8ee2103d09cf61bc;hpb=cf9967800843ea01e77b374b4d78fad4bc18a3f6;p=m6w6%2Fext-http diff --git a/http_functions.c b/http_functions.c index 96f3277..afe6f85 100644 --- a/http_functions.c +++ b/http_functions.c @@ -33,9 +33,9 @@ #include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_auth_api.h" -#include "php_http_curl_api.h" +#include "php_http_request_api.h" #include "php_http_cache_api.h" -#include "php_http_curl_api.h" +#include "php_http_request_api.h" #include "php_http_date_api.h" #include "php_http_headers_api.h" #include "php_http_message_api.h" @@ -249,7 +249,7 @@ PHP_FUNCTION(http_send_content_type) } if (!ct_len) { - RETURN_SUCCESS(http_send_content_type("application/x-octetstream", sizeof("application/x-octetstream") - 1)); + RETURN_SUCCESS(http_send_content_type("application/x-octetstream", lenof("application/x-octetstream"))); } RETURN_SUCCESS(http_send_content_type(ct, ct_len)); } @@ -296,9 +296,9 @@ PHP_FUNCTION(http_match_modified) } if (for_range) { - RETURN_BOOL(http_modified_match("HTTP_IF_UNMODIFIED_SINCE", t)); + RETURN_BOOL(http_match_last_modified("HTTP_IF_UNMODIFIED_SINCE", t)); } - RETURN_BOOL(http_modified_match("HTTP_IF_MODIFIED_SINCE", t)); + RETURN_BOOL(http_match_last_modified("HTTP_IF_MODIFIED_SINCE", t)); } /* }}} */ @@ -319,15 +319,15 @@ PHP_FUNCTION(http_match_etag) } if (for_range) { - RETURN_BOOL(http_etag_match("HTTP_IF_MATCH", etag)); + RETURN_BOOL(http_match_etag("HTTP_IF_MATCH", etag)); } - RETURN_BOOL(http_etag_match("HTTP_IF_NONE_MATCH", etag)); + RETURN_BOOL(http_match_etag("HTTP_IF_NONE_MATCH", etag)); } /* }}} */ /* {{{ proto bool http_cache_last_modified([int timestamp_or_expires]]) * - * If timestamp_or_exires is greater than 0, it is handled as timestamp + * If timestamp_or_expires is greater than 0, it is handled as timestamp * and will be sent as date of last modification. If it is 0 or omitted, * the current time will be sent as Last-Modified date. If it's negative, * it is handled as expiration time in seconds, which means that if the @@ -364,7 +364,7 @@ PHP_FUNCTION(http_cache_last_modified) send_modified = last_modified; } - RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1)); + RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL))); } /* }}} */ @@ -388,17 +388,15 @@ PHP_FUNCTION(http_cache_etag) RETURN_FALSE; } - RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1)); + RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL))); } /* }}} */ -/* {{{ proto string ob_httpetaghandler(string data, int mode) +/* {{{ proto string ob_etaghandler(string data, int mode) * * For use with ob_start(). - * Note that this has to be started as first output buffer. - * WARNING: Don't use with http_send_*(). */ -PHP_FUNCTION(ob_httpetaghandler) +PHP_FUNCTION(ob_etaghandler) { char *data; int data_len; @@ -408,20 +406,6 @@ PHP_FUNCTION(ob_httpetaghandler) RETURN_FALSE; } - if (mode & PHP_OUTPUT_HANDLER_START) { - if (HTTP_G(etag_started)) { - http_error(E_WARNING, HTTP_E_OBUFFER, "ob_httpetaghandler can only be used once"); - RETURN_STRINGL(data, data_len, 1); - } - http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL); - HTTP_G(etag_started) = 1; - } - - if (OG(ob_nesting_level) > 1) { - http_error(E_WARNING, HTTP_E_OBUFFER, "ob_httpetaghandler must be started prior to other output buffers"); - RETURN_STRINGL(data, data_len, 1); - } - Z_TYPE_P(return_value) = IS_STRING; http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode); } @@ -507,7 +491,6 @@ PHP_FUNCTION(http_send_data) } convert_to_string_ex(&zdata); - http_send_header("Accept-Ranges: bytes"); RETURN_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata))); } /* }}} */ @@ -529,7 +512,6 @@ PHP_FUNCTION(http_send_file) RETURN_FALSE; } - http_send_header("Accept-Ranges: bytes"); RETURN_SUCCESS(http_send_file(file)); } /* }}} */ @@ -549,7 +531,6 @@ PHP_FUNCTION(http_send_stream) } php_stream_from_zval(file, &zstream); - http_send_header("Accept-Ranges: bytes"); RETURN_SUCCESS(http_send_stream(file)); } /* }}} */ @@ -568,7 +549,7 @@ PHP_FUNCTION(http_chunked_decode) RETURN_FALSE; } - if (SUCCESS == http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) { + if (NULL != http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) { RETURN_STRINGL(decoded, decoded_len, 0); } else { RETURN_FALSE; @@ -585,7 +566,7 @@ PHP_FUNCTION(http_chunked_decode) * array( - * 'Status' => '200 Ok', + * 'Response Status' => '200 Ok', * 'Content-Type' => 'text/plain', * 'Content-Language' => 'en-US' * ), @@ -624,7 +605,7 @@ PHP_FUNCTION(http_split_response) */ PHP_FUNCTION(http_parse_headers) { - char *header, *rnrn; + char *header; int header_len; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) { @@ -632,11 +613,7 @@ PHP_FUNCTION(http_parse_headers) } array_init(return_value); - - if (rnrn = strstr(header, HTTP_CRLF HTTP_CRLF)) { - header_len = rnrn - header + 2; - } - if (SUCCESS != http_parse_headers(header, header_len, return_value)) { + if (SUCCESS != http_parse_headers(header, return_value)) { http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP headers"); zval_dtor(return_value); RETURN_FALSE; @@ -693,6 +670,8 @@ PHP_FUNCTION(http_get_request_headers) * - lastmodified: int, timestamp for If-(Un)Modified-Since header * - timeout: int, seconds the request may take * - connecttimeout: int, seconds the connect may take + * - onprogress: mixed, progress callback + * - ondebug: mixed, debug callback * * * The optional third parameter will be filled with some additional information @@ -796,6 +775,7 @@ PHP_FUNCTION(http_post_data) char *URL, *postdata; int postdata_len, URL_len; phpstr response; + http_request_body body; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &postdata, &postdata_len, &options, &info) != SUCCESS) { RETURN_FALSE; @@ -806,29 +786,39 @@ PHP_FUNCTION(http_post_data) array_init(info); } + body.type = HTTP_REQUEST_BODY_CSTRING; + body.data = postdata; + body.size = postdata_len; + phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); - if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETURN_PHPSTR_VAL(response); + if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { + RETVAL_PHPSTR_VAL(response); } else { - RETURN_FALSE; + RETVAL_FALSE; } + http_request_body_dtor(&body); } /* }}} */ -/* {{{ proto string http_post_array(string url, array data[, array options[, array &info]]) +/* {{{ proto string http_post_fields(string url, array data[, array files[, array options[, array &info]]]) * * Performs an HTTP POST request, posting www-form-urlencoded array data. * Returns the HTTP response as string. * See http_get() for a full list of available options. */ -PHP_FUNCTION(http_post_array) +PHP_FUNCTION(http_post_fields) { - zval *options = NULL, *info = NULL, *postdata; + zval *options = NULL, *info = NULL, *fields, *files = NULL; char *URL; int URL_len; phpstr response; + http_request_body body; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|aa/!z", &URL, &URL_len, &fields, &files, &options, &info) != SUCCESS) { + RETURN_FALSE; + } - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|a/!z", &URL, &URL_len, &postdata, &options, &info) != SUCCESS) { + if (SUCCESS != http_request_body_fill(&body, Z_ARRVAL_P(fields), files ? Z_ARRVAL_P(files) : NULL)) { RETURN_FALSE; } @@ -838,11 +828,96 @@ PHP_FUNCTION(http_post_array) } phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); - if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETURN_PHPSTR_VAL(response); + if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { + RETVAL_PHPSTR_VAL(response); } else { + RETVAL_FALSE; + } + http_request_body_dtor(&body); +} +/* }}} */ + +/* {{{ proto string http_put_file(string url, string file[, array options[, array &info]]) + * + */ +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; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &file, &f_len, &options, &info)) { RETURN_FALSE; } + + if (!(stream = php_stream_open_wrapper(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL))) { + RETURN_FALSE; + } + if (php_stream_stat(stream, &ssb)) { + php_stream_close(stream); + RETURN_FALSE; + } + + if (info) { + zval_dtor(info); + array_init(info); + } + + 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 { + RETVAL_FALSE; + } + http_request_body_dtor(&body); +} +/* }}} */ + +/* {{{ proto string http_put_stream(string url, resource stream[, array options[, array &info]]) + * + */ +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; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sr|a/!z", &URL, &URL_len, &resource, &options, &info)) { + RETURN_FALSE; + } + + php_stream_from_zval(stream, &resource); + if (php_stream_stat(stream, &ssb)) { + RETURN_FALSE; + } + + if (info) { + zval_dtor(info); + array_init(info); + } + + 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 { + RETURN_NULL(); + } } /* }}} */ @@ -1003,6 +1078,7 @@ PHP_FUNCTION(http_build_query) PHP_FUNCTION(http_test) { + RETURN_NULL(); } /* @@ -1013,4 +1089,3 @@ PHP_FUNCTION(http_test) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ -