php_end_ob_buffer(1, 1 TSRMLS_CC);
sapi_flush(TSRMLS_C);
-#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;
- }
+#if 0
+ fprintf(stderr, "Flushing after writing %u bytes\n", (uint) data_len);
#endif
+
+ if (HTTP_G->send.throttle_delay >= HTTP_DIFFSEC) {
+ http_sleep(HTTP_G->send.throttle_delay);
}
}
/* }}} */
http_encoding_stream *s = *((http_encoding_stream **) buffer);
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, NULL TSRMLS_CC);
+ if (HTTP_G->send.buffer_size) {
+ phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC);
+ } else {
+ http_flush(encoded, encoded_len);
+ }
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");
#endif
- } else {
+ } else if (HTTP_G->send.buffer_size) {
phpstr_chunked_output((phpstr **) buffer, data, data_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC);
+ } else {
+ http_flush(data, data_len);
}
}
/* }}} */
-#define HTTP_CHUNK_AVAIL(len, cs) ((len -= cs) >= 0)
/* {{{ http_send_response_data_fetch */
#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)
{
- long len = end - begin, chunk_size = 40960;
+ char *buf;
+ long got, len = end - begin;
- switch (mode)
- {
+ switch (mode) {
case SEND_RSRC:
{
php_stream *s = (php_stream *) data;
if (SUCCESS == php_stream_seek(s, begin, SEEK_SET)) {
- char *buf = emalloc(chunk_size);
-
- while (HTTP_CHUNK_AVAIL(len, chunk_size)) {
- http_send_response_data_plain(buffer, buf, php_stream_read(s, buf, chunk_size));
- }
- /* read & write left over */
- if (len) {
- http_send_response_data_plain(buffer, buf, php_stream_read(s, buf, chunk_size + len));
+ buf = emalloc(HTTP_SENDBUF_SIZE);
+
+ while (len > 0) {
+ got = php_stream_read(s, buf, MIN(len, HTTP_SENDBUF_SIZE));
+ http_send_response_data_plain(buffer, buf, got);
+ len -= got;
}
-
+
efree(buf);
}
+ break;
}
- break;
case SEND_DATA:
{
- char *s = (char *) data + begin;
-
- while (HTTP_CHUNK_AVAIL(len, chunk_size)) {
- http_send_response_data_plain(buffer, s, chunk_size);
- s += chunk_size;
- }
- /* write left over */
- if (len) {
- http_send_response_data_plain(buffer, s, chunk_size + len);
+ buf = (char *) data + begin;
+
+ while (len > 0) {
+ got = MIN(len, HTTP_SENDBUF_SIZE);
+ http_send_response_data_plain(buffer, buf, got);
+ len -= got;
+ buf += got;
}
+ break;
}
- break;
EMPTY_SWITCH_DEFAULT_CASE();
}
http_encoding_stream *s = *((http_encoding_stream **) buffer);
http_encoding_deflate_stream_finish(s, &encoded, &encoded_len);
- phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, 0, _http_flush, NULL TSRMLS_CC);
+ if (HTTP_G->send.buffer_size) {
+ phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, 0, _http_flush, NULL TSRMLS_CC);
+ } else {
+ http_flush(encoded, encoded_len);
+ }
http_encoding_deflate_stream_free(&s);
STR_FREE(encoded);
#else
http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug");
#endif
- } else {
+ } else if (HTTP_G->send.buffer_size) {
phpstr_chunked_output((phpstr **) buffer, NULL, 0, 0, _http_flush, NULL TSRMLS_CC);
}
}
{
STATUS status;
char *etag_header;
+ size_t etag_header_len;
if (!etag_len){
http_error_ex(HE_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G->send.unquoted_etag);
return FAILURE;
}
+ etag_header_len = spprintf(&etag_header, 0, "ETag: \"%s\"", etag);
+ status = http_send_header_string_ex(etag_header, etag_header_len, 1);
+
/* remember */
STR_SET(HTTP_G->send.unquoted_etag, estrndup(etag, etag_len));
- etag_len = spprintf(&etag_header, 0, "ETag: \"%s\"", etag);
- status = http_send_header_string_ex(etag_header, etag_len, 1);
-
if (sent_header) {
*sent_header = etag_header;
} else {
void *s = NULL;
HashTable ranges;
http_range_status range_status;
- int cache_etag = http_interrupt_ob_etaghandler();
if (!data_ptr) {
return FAILURE;
zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0);
range_status = http_get_request_ranges(&ranges, data_size);
- switch (range_status)
- {
+ switch (range_status) {
case RANGE_ERR:
{
zend_hash_destroy(&ranges);
/* single range */
zval **range, **begin, **end;
- if ( SUCCESS != zend_hash_index_find(&ranges, 0, (void **) &range) ||
- SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void **) &begin) ||
- SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void **) &end)) {
+ if ( SUCCESS != zend_hash_index_find(&ranges, 0, (void *) &range) ||
+ SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) ||
+ SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) {
/* this should never happen */
zend_hash_destroy(&ranges);
http_send_status(500);
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_GET_REQUEST_TIME(), (float) php_combined_lcg(TSRMLS_C));
+ 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);
http_send_status_header_ex(206, range_header_str, range_header_len, 1);
}
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)) {
+ 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;
case RANGE_NO:
{
zend_hash_destroy(&ranges);
-
+
/* send 304 Not Modified if etag matches - DON'T return on ETag generation failure */
- if (!no_cache && cache_etag) {
+ if (!no_cache && (http_interrupt_ob_etaghandler() || (HTTP_G->send.unquoted_etag != NULL))) {
char *etag = NULL;
- if ((etag = http_etag(data_ptr, data_size, data_mode))) {
+ if (HTTP_G->send.unquoted_etag) {
+ etag = estrdup(HTTP_G->send.unquoted_etag);
+ }
+
+ if (etag || (etag = http_etag(data_ptr, data_size, data_mode))) {
char *sent_header = NULL;
http_send_etag_ex(etag, strlen(etag), &sent_header);
return http_exit_ex(304, sent_header, NULL, 0);
} else {
STR_FREE(sent_header);
+ /* no caching for Last-Modified if ETags really don't match */
+ no_cache = http_got_server_var("HTTP_IF_NONE_MATCH");
}
efree(etag);
}
php_stream_statbuf ssb;
if ((!file) || php_stream_stat(file, &ssb)) {
+ char *defct = sapi_get_default_content_type(TSRMLS_C);
+
+ http_send_content_type(defct, strlen(defct));
+ http_send_header_string("Content-Disposition:");
+ http_error(HE_WARNING, HTTP_E_RESPONSE, "File not found; stat failed");
+ STR_FREE(defct);
+
+ if (HTTP_G->send.not_found_404) {
+ http_exit_ex(404, NULL, estrdup("File not found\n"), 0);
+ }
return FAILURE;
}
char *ct = NULL;
#ifdef HTTP_HAVE_MAGIC
- struct magic_set *magic;
+ struct magic_set *magic = NULL;
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) {
+ if (!data_ptr) {
+ http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Supplied payload is empty");
+ } else if (!(magic = magic_open(magicmode &~ MAGIC_MIME))) {
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));
magic_setflags(magic, magicmode);
- switch (data_mode)
- {
+ switch (data_mode) {
case SEND_RSRC:
{
char *buffer;
b_len = php_stream_copy_to_mem(data_ptr, &buffer, 65536, 0);
ctype = magic_buffer(magic, buffer, b_len);
efree(buffer);
+ break;
}
- break;
case SEND_DATA:
ctype = magic_buffer(magic, data_ptr, data_len);
- break;
+ break;
default:
HTTP_CHECK_OPEN_BASEDIR(data_ptr, magic_close(magic); return NULL);
ctype = magic_file(magic, data_ptr);
- break;
+ break;
}
if (ctype) {
projects / m6w6 / ext-http / blobdiff