char *buf;
long got, len = end - begin;
- switch (mode)
- {
+ switch (mode) {
case SEND_RSRC:
{
php_stream *s = (php_stream *) data;
efree(buf);
}
+ break;
}
- break;
case SEND_DATA:
{
len -= got;
buf += got;
}
+ break;
}
- break;
EMPTY_SWITCH_DEFAULT_CASE();
}
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;
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) {