Commit Graph

242 Commits

Author SHA1 Message Date
Xinchen Hui
d6d28458d5 Fixed unlink file 2014-03-05 14:40:49 +08:00
Dmitry Stogov
2b9b9afa7a Use better data structures (incomplete) 2014-02-17 17:59:18 +04:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Christopher Jones
3c166c4758 Merge branch 'PHP-5.5'
* PHP-5.5:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/gmp/gmp.c
2013-08-14 20:47:00 -07:00
Christopher Jones
39612afc72 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489 Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. 2013-08-14 20:36:50 -07:00
Anatol Belski
9d4e5b0dba Fix to file uploads >2G with size overflow
Represent the file size as string when the total size would overflow
LONG_MAX. Otherwise while file itself were uploaded, the size would
be shown wrong. This mostly applies to systems with 32 bit long.
2013-08-14 18:59:46 +02:00
Ralf Lang
8a7ea474a4 more precise condition 2013-08-06 22:51:58 +02:00
Ralf Lang
679fa1fc68 make this work in vc11 too 2013-08-06 22:51:58 +02:00
Ralf Lang
cb4c195f0b Use int64_t and atoll() after discussion with johannes 2013-08-06 22:51:57 +02:00
Ralf Lang
de3527002a ws 2013-08-06 22:51:57 +02:00
Ralf Lang
84f9213e00 Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files
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
2013-08-06 22:51:57 +02:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Klaus Silveira
16bd11062e Small performance improvement. The current code is correct, but if it is used inside a long loop or long strings, it's inefficient. 2012-04-02 22:54:57 -03:00
Dmitry Stogov
04f6171012 Improved max_input_vars directive to check nested variables 2012-02-14 08:58:52 +00:00
Dmitry Stogov
2ad7f44b7b Improved max_input_vars directive to check nested variables 2012-02-14 08:58:52 +00:00
Stanislav Malyshev
7c3177e5ab fix bug #54374, bug #55500 - filter file names better, no dangling [s 2012-01-01 23:54:25 +00:00
Stanislav Malyshev
2a687aed1a fix bug #54374, bug #55500 - filter file names better, no dangling [s 2012-01-01 23:54:25 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Hannes Magnusson
994df9f1d1 Fixed bug #55504 (Content-Type header is not parsed correctly on HTTP POST request 2011-09-07 16:19:09 +00:00
Hannes Magnusson
43fb787add Fixed bug #55504 (Content-Type header is not parsed correctly on HTTP POST request 2011-09-07 16:19:09 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Felipe Pena
907fd926e5 - Restore basename in filename on non Windows OS 2011-06-12 15:15:44 +00:00
Felipe Pena
2997719120 - Restore basename in filename on non Windows OS 2011-06-12 15:15:44 +00:00
Pierrick Charron
4a0831743d Remove unused variable 2011-03-13 05:25:45 +00:00
Moriyoshi Koizumi
b2ddc6de23 Fix ZTS build. 2011-03-06 07:06:55 +00:00
Moriyoshi Koizumi
cdb9ee0d1a Fix zend.multibyte oddities. Hope this will address all the known problems. 2011-03-06 07:00:30 +00:00
Ilia Alshanetsky
86550a9fed Win32 build fix 2011-01-19 13:09:05 +00:00
Ilia Alshanetsky
b5e12bd4da Fixed variable re-declaration 2011-01-18 13:17:23 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Dmitry Stogov
755c2cd0d8 Removed compile time dependency from ext/mbstring 2010-12-08 11:27:34 +00:00
Dmitry Stogov
dcb65e76da WS and cosmethic changes 2010-12-02 09:40:53 +00:00
Gustavo André dos Santos Lopes
e1aa908468 - Implemented FR #50692, not uploaded files don't count towards
max_file_uploads limit.
- As a side improvement, temporary files are not opened for
  empty uploads and, in debug mode, 0-length uploads.
2010-10-04 01:27:33 +00:00
Kalle Sommer Nielsen
159cd6916d Fixed compiler warnings in main/ 2010-08-17 12:49:19 +00:00
Kalle Sommer Nielsen
febee11285 Removed register_globals 2010-04-21 01:27:22 +00:00
Andrei Zmievski
f92fae2f66 I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.

Hope all the relevant parties are satisfied.
2010-03-18 22:37:25 +00:00
Andrei Zmievski
3220f15ca2 Fix a few problems with large (2G-4G) file uploads. Added
--enable-large-uploads-fix switch because one change was in SAPI.h structure.
2010-03-18 21:07:38 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Jani Taskinen
72a9c6d37a - Sync with HEAD 2009-12-29 19:25:09 +00:00
Jani Taskinen
1a64bb9c05 - WS + CS + folding tags 2009-12-29 18:59:58 +00:00
Ilia Alshanetsky
c3230ad217 Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive in HTTP uploads). 2009-12-29 15:57:54 +00:00
Rasmus Lerdorf
2e9c3ed919 Make it possible to disable post_max_size 2009-11-17 20:33:51 +00:00
Ilia Alshanetsky
2e13e89bd1 Simpify the max_file_uploads handling code 2009-11-16 13:34:57 +00:00
Ilia Alshanetsky
e2211cee86 Introduced a max_file_uploads INI setting, which is set to limit the
number of file uploads per-request to 100 by default, to prevent possible
DOS via temporary file exhaustion.
2009-10-27 16:13:48 +00:00