Skip to content

Patch: Allow uploading files > 2G https://bugs.php.net/bug.php?id=44522 #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
php-pulls merged 5 commits into from
Sep 17, 2013
Merged

Patch: Allow uploading files > 2G https://bugs.php.net/bug.php?id=44522 #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da04b2e
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files
ralflang Jun 28, 2013
f978f11
ws
ralflang Jun 28, 2013
a2394df
Use int64_t and atoll() after discussion with johannes
ralflang Jul 22, 2013
b07e55f
make this work in vc11 too
ralflang Jul 22, 2013
d80a910
more precise condition
ralflang Jul 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions main/SAPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "zend_operators.h"
#ifdef PHP_WIN32
#include "win95nt.h"
#include "win32/php_stdint.h"
#endif
#include <sys/stat.h>

Expand Down Expand Up @@ -82,7 +83,7 @@ typedef struct {
char *post_data, *raw_post_data;
char *cookie_data;
long content_length;
uint post_data_length, raw_post_data_length;
int64_t post_data_length, raw_post_data_length;

char *path_translated;
char *request_uri;
Expand Down Expand Up @@ -119,7 +120,7 @@ typedef struct _sapi_globals_struct {
void *server_context;
sapi_request_info request_info;
sapi_headers_struct sapi_headers;
int read_post_bytes;
int64_t read_post_bytes;
unsigned char headers_sent;
struct stat global_stat;
char *default_mimetype;
Expand Down
11 changes: 8 additions & 3 deletions main/rfc1867.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
#include "rfc1867.h"
#include "ext/standard/php_string.h"

#if defined(PHP_WIN32) && !defined(HAVE_ATOLL)
# define atoll(s) _atoi64(s)
#endif

#define DEBUG_FILE_UPLOAD ZEND_DEBUG

static int dummy_encoding_translation(TSRMLS_D)
Expand Down Expand Up @@ -676,8 +680,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;
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;
multipart_buffer *mbuff;
Expand Down Expand Up @@ -898,7 +903,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);
Expand Down
2 changes: 1 addition & 1 deletion sapi/cgi/cgi_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
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