X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=1082e296460651f289dae088a558421e7505bf8b;hp=ae7bc490de7d14f0df203a35af116e36e0a71371;hb=refs%2Fheads%2Fv1.7.x;hpb=aca5a5a21e4514707a71cfa69cc19ae50a78f5d3 diff --git a/http_send_api.c b/http_send_api.c index ae7bc49..1082e29 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2007, Michael Wallner | + | Copyright (c) 2004-2010, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -18,7 +18,6 @@ #include "php_http.h" #include "php_streams.h" -#include "ext/standard/php_lcg.h" #include "php_http_api.h" #include "php_http_cache_api.h" @@ -35,12 +34,16 @@ static inline void _http_flush(void *nothing, const char *data, size_t data_len /* we really only need to flush when throttling is enabled, because we push the data as fast as possible anyway if not */ if (HTTP_G->send.throttle_delay >= HTTP_DIFFSEC) { +#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399) + php_output_end_all(TSRMLS_C); +#else if (OG(ob_nesting_level)) { php_end_ob_buffer(1, 1 TSRMLS_CC); } if (!OG(implicit_flush)) { sapi_flush(TSRMLS_C); } +#endif http_sleep(HTTP_G->send.throttle_delay); } } @@ -204,27 +207,21 @@ PHP_HTTP_API void _http_send_header_zval_ex(const char *name, size_t name_len, z http_hide_header_ex(name, name_len); } else if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) { zend_bool first = replace; - zval **data; + zval **data_ptr; HashPosition pos; - FOREACH_HASH_VAL(pos, HASH_OF(*val), data) { - zval *orig = *data; + FOREACH_HASH_VAL(pos, HASH_OF(*val), data_ptr) { + zval *data = http_zsep(IS_STRING, *data_ptr); - convert_to_string_ex(data); - http_send_header_ex(name, name_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL); - if (orig != *data) { - zval_ptr_dtor(data); - } + http_send_header_ex(name, name_len, Z_STRVAL_P(data), Z_STRLEN_P(data), first, NULL); + zval_ptr_dtor(&data); first = 0; } } else { - zval *orig = *val; + zval *data = http_zsep(IS_STRING, *val); - convert_to_string_ex(val); - http_send_header_ex(name, name_len, Z_STRVAL_PP(val), Z_STRLEN_PP(val), replace, NULL); - if (orig != *val) { - zval_ptr_dtor(val); - } + http_send_header_ex(name, name_len, Z_STRVAL_P(data), Z_STRLEN_P(data), replace, NULL); + zval_ptr_dtor(&data); } } /* }}} */ @@ -401,11 +398,13 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s http_send_status(500); return FAILURE; } else { - char range_header_str[256]; - size_t range_header_len; - - range_header_len = snprintf(range_header_str, sizeof(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); + phpstr header; + + phpstr_init(&header); + phpstr_appendf(&header, "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); + phpstr_fix(&header); + http_send_status_header_ex(206, PHPSTR_VAL(&header), PHPSTR_LEN(&header), 1); + phpstr_dtor(&header); 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); http_send_response_finish(&s); @@ -417,36 +416,41 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s 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, sizeof(boundary_str), "%lu%0.9f", (ulong) HTTP_G->request.time, (float) php_combined_lcg(TSRMLS_C)); - range_header_len = snprintf(range_header_str, sizeof(range_header_str), "Content-Type: multipart/byteranges; boundary=%s", boundary_str); + char boundary_str[32]; + size_t boundary_len; + phpstr header, preface; - http_send_status_header_ex(206, range_header_str, range_header_len, 1); + boundary_len = http_boundary(boundary_str, sizeof(boundary_str)); + phpstr_init(&header); + phpstr_appendf(&header, "Content-Type: multipart/byteranges; boundary=%s", boundary_str); + phpstr_fix(&header); + http_send_status_header_ex(206, PHPSTR_VAL(&header), PHPSTR_LEN(&header), 1); + phpstr_dtor(&header); http_send_response_start(&s, 0); if (!content_type) { content_type = "application/x-octetstream"; } - + + phpstr_init(&preface); 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]; - size_t preface_len; - + #define HTTP_RANGE_PREFACE \ HTTP_CRLF "--%s" \ HTTP_CRLF "Content-Type: %s" \ HTTP_CRLF "Content-Range: bytes %ld-%ld/%zu" \ HTTP_CRLF HTTP_CRLF - - preface_len = snprintf(preface_str, sizeof(preface_str), HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); - http_send_response_data_plain(&s, preface_str, preface_len); + + phpstr_appendf(&preface, HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); + phpstr_fix(&preface); + http_send_response_data_plain(&s, PHPSTR_VAL(&preface), PHPSTR_LEN(&preface)); + phpstr_reset(&preface); http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1); } } + phpstr_dtor(&preface); http_send_response_data_plain(&s, HTTP_CRLF "--", lenof(HTTP_CRLF "--")); http_send_response_data_plain(&s, boundary_str, boundary_len); @@ -485,7 +489,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s } /* send 304 Not Modified if last modified matches */ - if (!no_cache && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G->send.last_modified)) { + if (!no_cache && HTTP_G->send.last_modified && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G->send.last_modified)) { char *sent_header = NULL; http_send_last_modified_ex(HTTP_G->send.last_modified, &sent_header); return http_exit_ex(304, sent_header, NULL, 0);