clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,858 Commits 491 Branches 1,363 Tags 839 MiB
00c7b973bb
Commit Graph

3911 Commits

Author SHA1 Message Date
Anatol Belski
39a2dcdeac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
 2013-12-12 10:46:21 +01:00
Anatol Belski
da62fd5ed8 Fixed bug #65486 mysqli_poll() is broken on Win x64 
While this issue is visible in mysqli_poll() functions, the cause
lays deeper in the stream to socket casting API. On Win x64 the
SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like
it's 32 bit signed integer. The game of casting 32 bit var to/from
64 bit pointer back and forth is the best way to break it.

Further more, while socket and file descriptors are always integers
on Linux, those are different things using different APIs on Windows.
Even though using integer instead of SOCKET might work on Windows, this
issue might need to be revamped more carefully later. By this time
this patch is tested well with phpt and apps and shows no regressions,
neither in mysqli_poll() nor in any other parts.
 2013-12-12 10:17:01 +01:00
Michael Wallner
9ea2489f5c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
 2013-12-06 10:33:47 +01:00
Michael Wallner
a48d82d238 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
 2013-12-06 10:33:10 +01:00
Michael Wallner
b5f5bff965 Fixed bug #61645 (fopen and O_NONBLOCK) 
if a mode like "rn" was passed to fopen(), then
php_stream_parse_fopen_modes() would assign O_WRONLY to
flags, because O_NONBLOCK tainted flags for the r/w/+ check
 2013-12-06 10:29:24 +01:00
Sara Golemon
df755deb45 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix php_module_startup() when loading more than one additional module
 2013-12-03 18:21:12 -08:00
Sara Golemon
00a7b1ff7f Fix php_module_startup() when loading more than one additional module 
Dereferencing addition_modules within php_module_startup would
point to a vector entirely on the stack (which is of course, wrong).

Use a specialized helper to keep BC with the current php_module_startup()
calling semantics.

Fixes 63159
Thanks to @a-j-k
 2013-12-03 18:20:19 -08:00
Julien Pauli
e9c6a1cfd2 5.5.8-dev now 2013-11-27 09:34:40 +01:00
Stanislav Malyshev
63f3ff7b5f 5.4.24-dev now 2013-11-27 00:13:45 -08:00
Julien Pauli
1984919ddc 5.5.7 now 2013-11-12 18:20:09 +01:00
Ferenc Kovacs
929bf11e91 bump API versions 2013-11-06 11:17:58 +01:00
Anatol Belski
39e7dcc3bb back to do_alloca() 2013-10-31 21:42:55 +01:00
Anatol Belski
fc707a27ff back to do_alloca(), reverted the wrong replacement 2013-10-30 20:13:14 +01:00
Stanislav Malyshev
4ded6ee971 5.4.23-dev 2013-10-29 18:11:02 -07:00
Anatol Belski
e17de5e9fd Merge branch 'bug50333' of github.com:weltling/php-src into bug50333 2013-10-29 17:15:40 +01:00
Adam Harvey
70c3a722e2 Increment version number, since this will be 5.5.6. 2013-10-23 12:36:27 -07:00
Anatol Belski
cf6ab0e915 applied and fixed the original patch 
initial work on the patch import done
 2013-10-17 10:40:43 +02:00
Anatol Belski
e30b2aae5a initial move on renaming files and fixing includes 2013-10-17 09:43:52 +02:00
Daniel Lowrey
2ddefbd2b3 Added support for TLSv1.1 and TLSv1.2 2013-10-08 14:09:17 -04:00
Stanislav Malyshev
b2f8f35a88 5.4.22-dev now 2013-10-01 22:25:56 -07: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