Commit Graph

3892 Commits

Author SHA1 Message Date
Daniel Lowrey
2ddefbd2b3 Added support for TLSv1.1 and TLSv1.2 2013-10-08 14:09:17 -04:00
Michael Wallner
11d60447f9 add note about request_body and php://input 2013-09-19 15:41:04 +02:00
Anatol Belski
86dfe7be49 better way to fix PRIu64 availability on windows 2013-09-18 15:14:36 +02:00
Michael Wallner
33c4b61c7f Merge branch 'PHP-5.5'
* PHP-5.5:
  fix a very rare case of use of uninitialized value combined with a memleak
2013-09-18 11:12:44 +02:00
Michael Wallner
a34b141e08 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix a very rare case of use of uninitialized value combined with a memleak
2013-09-18 11:12:11 +02:00
Michael Wallner
9bfd55cda3 fix a very rare case of use of uninitialized value combined with a
memleak
2013-09-18 11:10:55 +02:00
Anatol Belski
4a85b5e190 fix build - PRIu64 vs %I64u 2013-09-17 16:02:08 +02:00
Michael Wallner
423c70fb4d Merge branch 'slim-postdata-merge'
* slim-postdata-merge:
  remove unused code
  tests
  make reading php://input JIT if enable_post_data_reading=0
  revert stream cast
  fix ZTS build
  slim post data

Conflicts:
	ext/soap/soap.c
	ext/standard/php_fopen_wrapper.c
	main/SAPI.c
2013-09-17 13:52:25 +02:00
Michael Wallner
1c15d70cbd Merge branch 'slim-postdata'
* slim-postdata:
  slim post data
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
2013-09-17 10:50:49 +02:00
Michael Wallner
449d4c0b1c make reading php://input JIT if enable_post_data_reading=0 2013-09-10 13:13:33 +02:00
Michael Wallner
e3e4d1b144 revert stream cast 2013-09-10 13:13:09 +02:00
Julien Pauli
0e10f26e27 5.5.5 now 2013-09-04 11:22:23 +02:00
Stanislav Malyshev
7beef74a82 5.4.21 now 2013-09-03 13:38:15 -07:00
Michael Wallner
bb1f9d3826 slim post data 2013-08-27 13:43:22 +02:00
Michael Wallner
2438490add slim post data 2013-08-27 13:31:35 +02:00
Stanislav Malyshev
53d9643431 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  bump version
  Update NEWS

Conflicts:
	configure.in
	main/php_version.h
2013-08-19 23:23:21 -07:00
Stanislav Malyshev
d487f5e9ac bump version 2013-08-19 23:19:51 -07:00
Stanislav Malyshev
bf0c6f2858 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
2013-08-18 14:21:14 -07:00
Stanislav Malyshev
4fbce676bd Merge branch 'pull-request/381'
* pull-request/381:
  Fixed #65225: PHP_BINARY incorrectly set
2013-08-18 14:20:46 -07:00
Patrick Allaert
98d29d20a1 Fixed #65225: PHP_BINARY incorrectly set 2013-08-18 14:18:33 -07: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
Xinchen Hui
b6fa0b40f7 Merge branch 'PHP-5.5' 2013-08-14 11:44:53 +08:00
Xinchen Hui
f3d18add08 Merge branch 'PHP-5.4' into PHP-5.5 2013-08-14 11:44:37 +08:00
Xinchen Hui
f4dc2240a0 Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd 2013-08-14 11:42:39 +08:00
Anatol Belski
acea91b18c Fixes to unified stdint usage
This recalls 14caf174ff
2013-08-12 13:39:17 +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
Michael Wallner
14caf174ff unify stdint type usage
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Andrey Hristov
92d27ccb05 Constify streams API and a few other calls down the rabbit hole.
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
Stanislav Malyshev
2c23004a1e next is 5.5.2 2013-07-21 21:16:39 -07:00
Matteo Beccati
85bbc8fa9d Merge branch 'PHP-5.5'
* PHP-5.5:
  Properly fixed bug #63186 on NetBSD == 6.0
2013-07-19 09:40:15 +02:00
Matteo Beccati
1dc7d0da08 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Properly fixed bug #63186 on NetBSD == 6.0
2013-07-19 09:39:53 +02:00
Matteo Beccati
2b9d42433f Properly fixed bug #63186 on NetBSD == 6.0 2013-07-19 09:37:39 +02:00
Stanislav Malyshev
b9e3f737d9 5.4.19 is next 2013-07-17 13:51:15 -07:00
Anatol Belski
fb91fc6e2c Merge branch 'PHP-5.5'
* PHP-5.5:
  fix buffer overrun
2013-07-15 17:35:52 +02:00
Anatol Belski
e7a4cf8d7e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix buffer overrun
2013-07-15 17:35:29 +02:00
Anatol Belski
9561e598a0 fix buffer overrun 2013-07-15 17:34:36 +02:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96 typo fixes 2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Anatol Belski
638f1c3b79 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix possible resource leak and make sure there's something to qsort()
2013-07-10 13:32:13 +02:00
Anatol Belski
f5b9d87fb9 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix possible resource leak and make sure there's something to qsort()
2013-07-10 13:31:22 +02:00
Anatol Belski
29ac511b8a fix possible resource leak and make sure there's something to qsort() 2013-07-10 13:00:47 +02:00
Patrick Allaert
b980e4fedc Fixed #65225: PHP_BINARY incorrectly set 2013-07-09 15:05:10 +02:00