X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=88a27e1a7684cf83d6a82b422a76cf59fcd7e90c;hp=10b02f69663095feb7a7576edae547274cb99d44;hb=ebf03950ffaea849b931adf83b6c20ac9fb7ef33;hpb=2f39230d83bdf816dcae52c7e5a1b019347f0e7b diff --git a/http_send_api.c b/http_send_api.c index 10b02f6..88a27e1 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -366,7 +366,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s 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); @@ -455,6 +455,16 @@ PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_strea 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; }