diff options
| author | Ralf Lang <lang@b1-systems.de> | 2013-07-22 18:03:11 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-08-06 22:51:57 +0200 |
| commit | cb4c195f0b85ca5d91fee1ebe90105b8bb68356c (patch) | |
| tree | 4eb2b84e2e5d27e360bb0b90f87d827f5aa459fc | |
| parent | de3527002ae7e81d78cf535d810724b790cd5765 (diff) | |
| download | php-git-cb4c195f0b85ca5d91fee1ebe90105b8bb68356c.tar.gz | |
Use int64_t and atoll() after discussion with johannes
| -rw-r--r-- | main/SAPI.h | 4 | ||||
| -rw-r--r-- | main/rfc1867.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/SAPI.h b/main/SAPI.h index c3cacb515c..6d5434d141 100644 --- 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 452b6a332f..d3adf47114 100644 --- 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); |