Skip to content

Commit

Permalink
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files
Browse files Browse the repository at this point in the history
above 2G.

This is essentially the same as the patch
"uploads_larger_than_2g_HEAD_v2 (last revision 2012-03-26 03:59 UTC) by
jason at infininull dot com)" but using off_t instead of signed long
(originally: uint)

I tested this on 64bit linux and succeeded uploading a file of 4.8 G.
The File did not get corrupted or truncated in any way.

I did not yet test this under windows or 32 bit linux

Note that there are still limitations:

* Did not test for files > 8 G
* php does not yet reject absurdly high values
* Still limited by underlying file system specific limits and free space
* in upload
* tmp dir and destination dir
  • Loading branch information
ralflang authored and m6w6 committed Aug 6, 2013
1 parent 14caf17 commit 84f9213
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions main/SAPI.h
Expand Up @@ -82,7 +82,7 @@ typedef struct {
char *post_data, *raw_post_data;
char *cookie_data;
long content_length;
uint post_data_length, raw_post_data_length;
off_t post_data_length, raw_post_data_length;

char *path_translated;
char *request_uri;
Expand Down Expand Up @@ -119,7 +119,7 @@ typedef struct _sapi_globals_struct {
void *server_context;
sapi_request_info request_info;
sapi_headers_struct sapi_headers;
int read_post_bytes;
off_t read_post_bytes;
unsigned char headers_sent;
struct stat global_stat;
char *default_mimetype;
Expand Down
5 changes: 3 additions & 2 deletions main/rfc1867.c
Expand Up @@ -676,8 +676,9 @@ 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, total_bytes = 0, cancel_upload = 0, is_arr_upload = 0, array_len = 0;
int max_file_size = 0, skip_upload = 0, anonindex = 0, is_anonymous;
int boundary_len = 0, cancel_upload = 0, is_arr_upload = 0, array_len = 0;
off_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;
multipart_buffer *mbuff;
Expand Down
2 changes: 1 addition & 1 deletion sapi/cgi/cgi_main.c
Expand Up @@ -508,7 +508,7 @@ static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
uint read_bytes = 0;
int tmp_read_bytes;

count_bytes = MIN(count_bytes, (uint) SG(request_info).content_length - SG(read_post_bytes));
count_bytes = MIN(count_bytes, SG(request_info).content_length - SG(read_post_bytes));
while (read_bytes < count_bytes) {
tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes, count_bytes - read_bytes);
if (tmp_read_bytes <= 0) {
Expand Down

0 comments on commit 84f9213

Please sign in to comment.