- add HttpMessage::guessContentType()

[m6w6/ext-http] / http_send_api.c

diff --git a/http_send_api.c b/http_send_api.c
index 10b02f69663095feb7a7576edae547274cb99d44..587870f8a85fb170ec408dc5aedd30eab7b4b22e 100644 (file)
--- 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;
        }
 
@@ -474,15 +484,13 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
        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));