#include "php_http_headers_api.h"
#include "php_http_send_api.h"
+/* {{{ http_flush() */
#define http_flush(d, l) _http_flush(NULL, (d), (l) TSRMLS_CC)
-/* {{{ static inline void http_flush() */
static inline void _http_flush(void *nothing, const char *data, size_t data_len TSRMLS_DC)
{
PHPWRITE(data, data_len);
- php_end_ob_buffer(1, 1 TSRMLS_CC);
- sapi_flush(TSRMLS_C);
-
-#if 0
- fprintf(stderr, "Flushing after writing %u bytes\n", (uint) data_len);
-#endif
-
+ /* 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 (OG(ob_nesting_level)) {
+ php_end_ob_buffer(1, 1 TSRMLS_CC);
+ }
+ if (!OG(implicit_flush)) {
+ sapi_flush(TSRMLS_C);
+ }
http_sleep(HTTP_G->send.throttle_delay);
}
}
if ((encoding = http_encoding_response_start(content_length, 0))) {
#ifdef HTTP_HAVE_ZLIB
- *buffer = http_encoding_deflate_stream_init(NULL,
+ *((http_encoding_stream **) buffer) = http_encoding_deflate_stream_init(NULL,
(encoding == HTTP_ENCODING_GZIP) ?
HTTP_DEFLATE_TYPE_GZIP : HTTP_DEFLATE_TYPE_ZLIB);
#endif
}
+ /* flush headers */
+ sapi_flush(TSRMLS_C);
}
/* }}} */
#define http_send_response_data_fetch(b, d, l, m, s, e) _http_send_response_data_fetch((b), (d), (l), (m), (s), (e) TSRMLS_CC)
static inline void _http_send_response_data_fetch(void **buffer, const void *data, size_t data_len, http_send_mode mode, size_t begin, size_t end TSRMLS_DC)
{
- char *buf;
- long got, len = end - begin;
+ long bsz, got, len = end - begin;
+
+ if (!(bsz = HTTP_G->send.buffer_size)) {
+ bsz = HTTP_SENDBUF_SIZE;
+ }
switch (mode) {
- case SEND_RSRC:
- {
+ case SEND_RSRC: {
php_stream *s = (php_stream *) data;
-
if (SUCCESS == php_stream_seek(s, begin, SEEK_SET)) {
- buf = emalloc(HTTP_SENDBUF_SIZE);
+ char *buf = emalloc(bsz);
while (len > 0) {
- got = php_stream_read(s, buf, MIN(len, HTTP_SENDBUF_SIZE));
+ got = php_stream_read(s, buf, MIN(len, bsz));
http_send_response_data_plain(buffer, buf, got);
len -= got;
}
}
break;
}
-
- case SEND_DATA:
- {
- buf = (char *) data + begin;
-
+ case SEND_DATA: {
+ const char *buf = ((const char *) data) + begin;
while (len > 0) {
- got = MIN(len, HTTP_SENDBUF_SIZE);
+ got = MIN(len, bsz);
http_send_response_data_plain(buffer, buf, got);
len -= got;
buf += got;
}
break;
}
-
EMPTY_SWITCH_DEFAULT_CASE();
}
}
/* {{{ void http_send_header_zval(char*, zval **, zend_bool) */
PHP_HTTP_API void _http_send_header_zval_ex(const char *name, size_t name_len, zval **val, zend_bool replace TSRMLS_DC)
{
- if (!val || Z_TYPE_PP(val) == IS_NULL || (Z_TYPE_PP(val) == IS_STRING && !Z_STRLEN_PP(val))) {
+ if (!val || !*val || Z_TYPE_PP(val) == IS_NULL || (Z_TYPE_PP(val) == IS_STRING && !Z_STRLEN_PP(val))) {
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;
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/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
+ 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);
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);
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", (ulong) HTTP_G->request.time, (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);
+ 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);
http_send_status_header_ex(206, range_header_str, range_header_len, 1);
http_send_response_start(&s, 0);
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);
+ 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);
http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1);
}
{
STATUS status;
php_stream_statbuf ssb;
+ int orig_flags;
if ((!file) || php_stream_stat(file, &ssb)) {
char *defct = sapi_get_default_content_type(TSRMLS_C);
return FAILURE;
}
+ orig_flags = file->flags;
+ file->flags |= PHP_STREAM_FLAG_NO_BUFFER;
status = http_send_ex(file, ssb.sb.st_size, SEND_RSRC, no_cache);
-
+ file->flags = orig_flags;
+
if (close_stream) {
php_stream_close(file);
}
projects / m6w6 / ext-http / blobdiff