X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=103dc958a77fc8df65b32f8c5169c10c0156f682;hp=2a531078a4b12653b0d6bcbdf5d00a99365531c5;hb=7b88d9022c90eb12e5fe195af8644935141c9d68;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c diff --git a/http_send_api.c b/http_send_api.c index 2a53107..103dc95 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -15,25 +15,23 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "php.h" + +#define HTTP_WANT_ZLIB +#define HTTP_WANT_MAGIC +#include "php_http.h" #include "SAPI.h" #include "php_streams.h" #include "ext/standard/php_lcg.h" -#include "php_http.h" -#include "php_http_std_defs.h" #include "php_http_api.h" -#include "php_http_date_api.h" -#include "php_http_send_api.h" -#include "php_http_headers_api.h" -#include "php_http_date_api.h" #include "php_http_cache_api.h" +#include "php_http_date_api.h" #include "php_http_encoding_api.h" +#include "php_http_headers_api.h" +#include "php_http_send_api.h" -ZEND_EXTERN_MODULE_GLOBALS(http); - -#define http_flush(d, l) _http_flush((d), (l) SRMLS_CC) +#define http_flush(d, l) _http_flush((d), (l) TSRMLS_CC) /* {{{ static inline void http_flush() */ static inline void _http_flush(const char *data, size_t data_len TSRMLS_DC) { @@ -71,16 +69,13 @@ static inline void _http_flush(const char *data, size_t data_len TSRMLS_DC) #define http_send_response_start(b, cl) _http_send_response_start((b), (cl) TSRMLS_CC) static inline void _http_send_response_start(void **buffer, size_t content_length TSRMLS_DC) { - if (http_encoding_response_start(content_length)) { + int encoding; + + if ((encoding = http_encoding_response_start(content_length))) { #ifdef HTTP_HAVE_ZLIB - char *encoded; - size_t encoded_len; - http_encoding_stream *s = emalloc(sizeof(http_encoding_stream)); - - http_encoding_stream_init(s, HTTP_G(send).gzip_encoding == HTTP_ENCODING_GZIP, -1, &encoded, &encoded_len); - phpstr_chunked_output(&s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC); - STR_FREE(encoded); - *buffer = s; + *buffer = http_encoding_deflate_stream_init(NULL, + (encoding == HTTP_ENCODING_GZIP) ? + HTTP_DEFLATE_TYPE_GZIP : HTTP_DEFLATE_TYPE_ZLIB); #endif } } @@ -90,14 +85,14 @@ static inline void _http_send_response_start(void **buffer, size_t content_lengt #define http_send_response_data_plain(b, d, dl) _http_send_response_data_plain((b), (d), (dl) TSRMLS_CC) static inline void _http_send_response_data_plain(void **buffer, const char *data, size_t data_len TSRMLS_DC) { - if (HTTP_G(send).gzip_encoding) { + if (HTTP_G(send).deflate.encoding) { #ifdef HTTP_HAVE_ZLIB char *encoded; size_t encoded_len; http_encoding_stream *s = *((http_encoding_stream **) buffer); - http_encoding_stream_update(s, data, data_len, &encoded, &encoded_len); - phpstr_chunked_output(&s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC); + http_encoding_deflate_stream_update(s, data, data_len, &encoded, &encoded_len); + phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC); efree(encoded); #else http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug"); @@ -161,16 +156,16 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat #define http_send_response_finish(b) _http_send_response_finish((b) TSRMLS_CC) static inline void _http_send_response_finish(void **buffer TSRMLS_DC) { - if (HTTP_G(send).gzip_encoding) { + if (HTTP_G(send).deflate.encoding) { #ifdef HTTP_HAVE_ZLIB char *encoded = NULL; size_t encoded_len = 0; http_encoding_stream *s = *((http_encoding_stream **) buffer); - http_encoding_stream_finish(s, &encoded, &encoded_len); - phpstr_chunked_output(&s->storage, encoded, encoded_len, 0, _http_flush TSRMLS_CC); + http_encoding_deflate_stream_finish(s, &encoded, &encoded_len); + phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, 0, _http_flush TSRMLS_CC); + http_encoding_deflate_stream_free(&s); STR_FREE(encoded); - efree(s); #else http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug"); #endif @@ -313,14 +308,14 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0); range_status = http_get_request_ranges(&ranges, data_size); - if (range_status == RANGE_ERR) { - zend_hash_destroy(&ranges); - http_send_status(416); - return FAILURE; - } - switch (range_status) { + case RANGE_ERR: + { + zend_hash_destroy(&ranges); + http_send_status(416); + return FAILURE; + } case RANGE_OK: { /* Range Request - only send ranges if entity hasn't changed */ @@ -338,7 +333,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s char range_header_str[256]; size_t range_header_len; - range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Range: bytes %ld-%ld/%lu", Z_LVAL_PP(begin), Z_LVAL_PP(end), (unsigned long) data_size); + range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); http_send_status_header_ex(206, range_header_str, range_header_len, 1); http_send_response_start(&s, Z_LVAL_PP(end)-Z_LVAL_PP(begin)+1); http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1); @@ -348,12 +343,13 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s } } else { /* multi range */ + HashPosition pos; zval **range, **begin, **end; const char *content_type = HTTP_G(send).content_type; char boundary_str[32], range_header_str[256]; size_t boundary_len, range_header_len; - boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (unsigned long) time(NULL), (float) php_combined_lcg(TSRMLS_C)); + boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (ulong) time(NULL), (float) php_combined_lcg(TSRMLS_C)); range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Type: multipart/byteranges; boundary=%s", boundary_str); http_send_status_header_ex(206, range_header_str, range_header_len, 1); @@ -363,7 +359,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s content_type = "application/x-octetstream"; } - FOREACH_HASH_VAL(&ranges, range) { + FOREACH_HASH_VAL(pos, &ranges, range) { if ( SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void **) &begin) && SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void **) &end)) { char preface_str[512]; @@ -372,7 +368,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s #define HTTP_RANGE_PREFACE \ HTTP_CRLF "--%s" \ HTTP_CRLF "Content-Type: %s" \ - HTTP_CRLF "Content-Range: bytes %ld-%ld/%lu" \ + HTTP_CRLF "Content-Range: bytes %ld-%ld/%zu" \ HTTP_CRLF HTTP_CRLF preface_len = snprintf(preface_str, lenof(preface_str), HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); @@ -399,7 +395,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s if (!no_cache && cache_etag) { char *etag = NULL; - if (etag = http_etag(data_ptr, data_size, data_mode)) { + if ((etag = http_etag(data_ptr, data_size, data_mode))) { char *sent_header = NULL; http_send_etag_ex(etag, strlen(etag), &sent_header); @@ -450,6 +446,69 @@ PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_strea } /* }}} */ +/* {{{ char *http_guess_content_type(char *magic_file, long magic_mode, void *data, size_t size, http_send_mode mode) */ +PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmode, void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC) +{ + char *ct = NULL; + +#ifdef HTTP_HAVE_MAGIC + struct magic_set *magic; + + HTTP_CHECK_OPEN_BASEDIR(magicfile, return NULL); + + /* magic_load() fails if MAGIC_MIME is set because it + cowardly adds .mime to the file name */ + magic = magic_open(magicmode &~ MAGIC_MIME); + + if (!magic) { + http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode); + } else if (-1 == magic_load(magic, magicfile)) { + http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s' (%s)", magicfile, magic_error(magic)); + } else { + const char *ctype = NULL; + + magic_setflags(magic, magicmode); + + switch (data_mode) + { + case SEND_RSRC: + { + char *buffer; + size_t b_len; + + b_len = php_stream_copy_to_mem(data_ptr, &buffer, 65536, 0); + ctype = magic_buffer(magic, buffer, b_len); + efree(buffer); + } + break; + + case SEND_DATA: + ctype = magic_buffer(magic, data_ptr, data_len); + break; + + default: + HTTP_CHECK_OPEN_BASEDIR(data_ptr, magic_close(magic); return NULL); + ctype = magic_file(magic, data_ptr); + break; + } + + if (ctype) { + ct = estrdup(ctype); + } else { + http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to guess Content-Type: %s", magic_error(magic)); + } + } + if (magic) { + magic_close(magic); + } +#else + http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available"); +#endif + + return ct; +} +/* }}} */ + /* * Local variables: * tab-width: 4