Use int64_t and atoll() after discussion with johannes

diff --git a/main/SAPI.h b/main/SAPI.h
index c3cacb515c78f61e51541feae165f3c4cf11ed5a..6d5434d141b5472107e97f3244372952fbbc08ec 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -82,7 +82,7 @@ typedef struct {
        char *post_data, *raw_post_data;
        char *cookie_data;
        long content_length;
-       off_t post_data_length, raw_post_data_length;
+       int64_t post_data_length, raw_post_data_length;
 
        char *path_translated;
        char *request_uri;
@@ -119,7 +119,7 @@ typedef struct _sapi_globals_struct {
        void *server_context;
        sapi_request_info request_info;
        sapi_headers_struct sapi_headers;
-       off_t read_post_bytes;
+       int64_t read_post_bytes;
        unsigned char headers_sent;
        struct stat global_stat;
        char *default_mimetype;

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 452b6a332fd2c8f95d65d1c39944bd75750388b5..d3adf4711407fdc520b4aeb84ed927eca03c4627 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -677,7 +677,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
        char *boundary, *s = NULL, *boundary_end = NULL, *start_arr = NULL, *array_index = NULL;
        char *temp_filename = NULL, *lbuf = NULL, *abuf = NULL;
        int boundary_len = 0, cancel_upload = 0, is_arr_upload = 0, array_len = 0;
-       off_t total_bytes = 0, max_file_size = 0;
+       int64_t total_bytes = 0, max_file_size = 0;
        int skip_upload = 0, anonindex = 0, is_anonymous;
        zval *http_post_files = NULL;
        HashTable *uploaded_files = NULL;
@@ -899,7 +899,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
                                }
 
                                if (!strcasecmp(param, "MAX_FILE_SIZE")) {
-                                       max_file_size = atol(value);
+                                       max_file_size = atoll(value);
                                }
 
                                efree(param);