| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* 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);
}
}
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);
}
}
/* }}} */
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);
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;
+ char boundary_str[32];
+ size_t boundary_len;
+ phpstr header, preface;
boundary_len = http_boundary(boundary_str, sizeof(boundary_str));
- 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);
+ 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);
}
/* 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);