X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=023c6ecb4398f78b390574a034b3388bfcb220df;hp=41ba3058e556d1089853ecf3e2d670ce10696531;hb=020d5b055921392c0dfb25043962a40867d8b033;hpb=e434da0fad7db62d86c236c68b22150165f2647a diff --git a/http_send_api.c b/http_send_api.c index 41ba305..023c6ec 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -18,11 +18,11 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include "php.h" + +#include "SAPI.h" #include "php_streams.h" #include "ext/standard/php_lcg.h" -#include "SAPI.h" #include "php_http.h" #include "php_http_std_defs.h" @@ -35,6 +35,63 @@ ZEND_EXTERN_MODULE_GLOBALS(http); +#define http_flush() _http_flush(TSRMLS_C) +/* {{{ static inline void http_flush() */ +static inline void _http_flush(TSRMLS_D) +{ + php_end_ob_buffer(1, 1 TSRMLS_CC); + sapi_flush(TSRMLS_C); +} +/* }}} */ + +#define http_sleep() _http_sleep(TSRMLS_C) +/* {{{ static inline void http_sleep() */ +static inline void _http_sleep(TSRMLS_D) +{ +#define HTTP_MSEC(s) (s * 1000) +#define HTTP_USEC(s) (HTTP_MSEC(s) * 1000) +#define HTTP_NSEC(s) (HTTP_USEC(s) * 1000) +#define HTTP_NANOSEC (1000 * 1000 * 1000) +#define HTTP_DIFFSEC (0.001) + + if (HTTP_G(send).throttle_delay >= HTTP_DIFFSEC) { +#if defined(PHP_WIN32) + Sleep((DWORD) HTTP_MSEC(HTTP_G(send).throttle_delay)); +#elif defined(HAVE_USLEEP) + usleep(HTTP_USEC(HTTP_G(send).throttle_delay)); +#elif defined(HAVE_NANOSLEEP) + struct timespec req, rem; + + req.tv_sec = (time_t) HTTP_G(send).throttle_delay; + req.tv_nsec = HTTP_NSEC(HTTP_G(send).throttle_delay) % HTTP_NANOSEC; + + while (nanosleep(&req, &rem) && (errno == EINTR) && (HTTP_NSEC(rem.tv_sec) + rem.tv_nsec) > HTTP_NSEC(HTTP_DIFFSEC))) { + req.tv_sec = rem.tv_sec; + req.tv_nsec = rem.tv_nsec; + } +#endif + } +} +/* }}} */ + +#define HTTP_CHUNK_AVAIL(len) ((len -= HTTP_G(send).buffer_size) >= 0) +#define HTTP_CHUNK_WRITE(data, l, dofree, dosleep) \ + { \ + long size = (long) l; \ + \ + if ((1 > size) || (size - PHPWRITE(data, size))) { \ + if (dofree) { \ + efree(data); \ + } \ + return FAILURE; \ + } \ + \ + http_flush(); \ + if (dosleep) { \ + http_sleep(); \ + } \ + } + #define http_send_chunk(d, b, e, m) _http_send_chunk((d), (b), (e), (m) TSRMLS_CC) /* {{{ static STATUS http_send_chunk(const void *, size_t, size_t, http_send_mode) */ static STATUS _http_send_chunk(const void *data, size_t begin, size_t end, http_send_mode mode TSRMLS_DC) @@ -46,44 +103,23 @@ static STATUS _http_send_chunk(const void *data, size_t begin, size_t end, http_ case SEND_RSRC: { char *buf; - size_t read = 0; php_stream *s = (php_stream *) data; if (php_stream_seek(s, begin, SEEK_SET)) { return FAILURE; } - buf = (char *) ecalloc(1, HTTP_SENDBUF_SIZE); - /* read into buf and write out */ - while ((len -= HTTP_SENDBUF_SIZE) >= 0) { - if (!(read = php_stream_read(s, buf, HTTP_SENDBUF_SIZE))) { - efree(buf); - return FAILURE; - } - if (read - php_body_write(buf, read TSRMLS_CC)) { - efree(buf); - return FAILURE; - } - /* ob_flush() && flush() */ - php_end_ob_buffer(1, 1 TSRMLS_CC); - sapi_flush(TSRMLS_C); + buf = emalloc(HTTP_G(send).buffer_size); + + while (HTTP_CHUNK_AVAIL(len)) { + HTTP_CHUNK_WRITE(buf, php_stream_read(s, buf, HTTP_G(send).buffer_size), 1, 1); } /* read & write left over */ if (len) { - if (read = php_stream_read(s, buf, HTTP_SENDBUF_SIZE + len)) { - if (read - php_body_write(buf, read TSRMLS_CC)) { - efree(buf); - return FAILURE; - } - } else { - efree(buf); - return FAILURE; - } - /* ob_flush() & flush() */ - php_end_ob_buffer(1, 1 TSRMLS_CC); - sapi_flush(TSRMLS_C); + HTTP_CHUNK_WRITE(buf, php_stream_read(s, buf, HTTP_G(send).buffer_size + len), 1, 0); } + efree(buf); return SUCCESS; } @@ -92,25 +128,16 @@ static STATUS _http_send_chunk(const void *data, size_t begin, size_t end, http_ { char *s = (char *) data + begin; - while ((len -= HTTP_SENDBUF_SIZE) >= 0) { - if (HTTP_SENDBUF_SIZE - php_body_write(s, HTTP_SENDBUF_SIZE TSRMLS_CC)) { - return FAILURE; - } - s += HTTP_SENDBUF_SIZE; - /* ob_flush() & flush() */ - php_end_ob_buffer(1, 1 TSRMLS_CC); - sapi_flush(TSRMLS_C); + while (HTTP_CHUNK_AVAIL(len)) { + HTTP_CHUNK_WRITE(s, HTTP_G(send).buffer_size, 0, 1); + s += HTTP_G(send).buffer_size; } /* write left over */ if (len) { - if (HTTP_SENDBUF_SIZE + len - php_body_write(s, HTTP_SENDBUF_SIZE + len TSRMLS_CC)) { - return FAILURE; - } - /* ob_flush() & flush() */ - php_end_ob_buffer(1, 1 TSRMLS_CC); - sapi_flush(TSRMLS_C); + HTTP_CHUNK_WRITE(s, HTTP_G(send).buffer_size + len, 0, 0); } + return SUCCESS; } @@ -123,11 +150,11 @@ static STATUS _http_send_chunk(const void *data, size_t begin, size_t end, http_ /* {{{ STATUS http_send_status_header(int, char *) */ -PHP_HTTP_API STATUS _http_send_status_header(int status, const char *header TSRMLS_DC) +PHP_HTTP_API STATUS _http_send_status_header_ex(int status, const char *header, zend_bool replace TSRMLS_DC) { STATUS ret; sapi_header_line h = {(char *) header, header ? strlen(header) : 0, status}; - if (SUCCESS != (ret = sapi_header_op(SAPI_HEADER_REPLACE, &h TSRMLS_CC))) { + if (SUCCESS != (ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, &h TSRMLS_CC))) { http_error_ex(E_WARNING, HTTP_E_HEADER, "Could not send header: %s (%d)", header, status); } return ret; @@ -144,7 +171,7 @@ PHP_HTTP_API STATUS _http_send_last_modified(time_t t TSRMLS_DC) efree(date); /* remember */ - HTTP_G(lmod) = t; + HTTP_G(send).last_modified = t; return http_send_header(modified); } @@ -159,15 +186,13 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag, size_t etag_len TSRMLS_DC) char *etag_header; if (!etag_len){ - http_error_ex(E_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G(etag)); + http_error_ex(E_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G(send).unquoted_etag); return FAILURE; } /* remember */ - if (HTTP_G(etag)) { - efree(HTTP_G(etag)); - } - HTTP_G(etag) = estrdup(etag); + STR_FREE(HTTP_G(send).unquoted_etag); + HTTP_G(send).unquoted_etag = estrdup(etag); etag_header = ecalloc(1, sizeof("ETag: \"\"") + etag_len); sprintf(etag_header, "ETag: \"%s\"", etag); @@ -202,10 +227,8 @@ PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_ } /* remember for multiple ranges */ - if (HTTP_G(ctype)) { - efree(HTTP_G(ctype)); - } - HTTP_G(ctype) = estrndup(content_type, ct_len); + STR_FREE(HTTP_G(send).content_type); + HTTP_G(send).content_type = estrndup(content_type, ct_len); ct_header = ecalloc(1, sizeof("Content-Type: ") + ct_len); sprintf(ct_header, "Content-Type: %s", content_type); @@ -248,6 +271,7 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_ if (SUCCESS != zend_hash_index_find(ranges, 0, (void **) &zrange) || SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin) || SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end)) { + http_send_status(500); return FAILURE; } @@ -290,20 +314,20 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_ HTTP_CRLF, bound, - HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream", + HTTP_G(send).content_type ? HTTP_G(send).content_type : "application/x-octetstream", **begin, **end, size ); - php_body_write(preface, strlen(preface) TSRMLS_CC); + PHPWRITE(preface, strlen(preface)); http_send_chunk(data, **begin, **end + 1, mode); } /* write boundary once more */ - php_body_write(HTTP_CRLF, sizeof(HTTP_CRLF) - 1 TSRMLS_CC); - php_body_write(bound, strlen(bound) TSRMLS_CC); - php_body_write("--", 2 TSRMLS_CC); + PHPWRITE(HTTP_CRLF, lenof(HTTP_CRLF)); + PHPWRITE(bound, strlen(bound)); + PHPWRITE("--", lenof("--")); return SUCCESS; } @@ -325,9 +349,9 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send } /* stop on-the-fly etag generation */ - if (cache_etag = HTTP_G(etag_started)) { + if (cache_etag = HTTP_G(etag).started) { /* interrupt ob_etaghandler */ - HTTP_G(etag_started) = 0; + HTTP_G(etag).started = 0; } /* enable partial dl and resume */ @@ -344,8 +368,8 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send /* Range Request - only send ranges if entity hasn't changed */ if ( range_status == RANGE_OK && - http_match_etag_ex("HTTP_IF_MATCH", HTTP_G(etag), 0) && - http_match_last_modified_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(lmod), 0)) { + http_match_etag_ex("HTTP_IF_MATCH", HTTP_G(send).unquoted_etag, 0) && + http_match_last_modified_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(send).last_modified, 0)) { STATUS result = http_send_ranges(&ranges, data_ptr, data_size, data_mode); zend_hash_destroy(&ranges); return result; @@ -353,26 +377,24 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send zend_hash_destroy(&ranges); - /* send 304 Not Modified if etag matches */ + /* send 304 Not Modified if etag matches - DON'T return on ETag generation failure */ if (cache_etag) { char *etag = NULL; if (!(etag = http_etag(data_ptr, data_size, data_mode))) { - return FAILURE; - } - if (SUCCESS != http_send_etag(etag, 32)) { + http_error(E_NOTICE, HTTP_E_PARAM, "Failed to generate ETag for data source"); + } else { + http_send_etag(etag, 32); + if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) { + return http_cache_exit_ex(etag, 1, 1); + } efree(etag); - return FAILURE; - } - if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) { - return http_cache_exit_ex(etag, 1, 1); } - efree(etag); } /* send 304 Not Modified if last modified matches */ - if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G(lmod))) { - return http_cache_exit_ex(http_date(HTTP_G(lmod)), 0, 1); + if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G(send).last_modified)) { + return http_cache_exit_ex(http_date(HTTP_G(send).last_modified), 0, 1); } /* send full entity */ @@ -384,12 +406,13 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_stream TSRMLS_DC) { STATUS status; + php_stream_statbuf ssb; - if ((!file) || php_stream_stat(file, &HTTP_G(ssb))) { + if ((!file) || php_stream_stat(file, &ssb)) { return FAILURE; } - status = http_send(file, HTTP_G(ssb).sb.st_size, SEND_RSRC); + status = http_send(file, ssb.sb.st_size, SEND_RSRC); if (close_stream) { php_stream_close(file); @@ -399,7 +422,6 @@ PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_strea } /* }}} */ - /* * Local variables: * tab-width: 4