clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,850 Commits 494 Branches 1,367 Tags 800 MiB
39a2dcdeac
Commit Graph

537 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
Anatol Belski
e17de5e9fd Merge branch 'bug50333' of github.com:weltling/php-src into bug50333 2013-10-29 17:15:40 +01: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
Daniel Lowrey
2ddefbd2b3 Added support for TLSv1.1 and TLSv1.2 2013-10-08 14:09:17 -04: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
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
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
Matteo Beccati
6f594514b0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63186 (compile failure on netbsd)
 2013-06-14 16:55:12 +02:00
Matteo Beccati
02f552ceca Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63186 (compile failure on netbsd)
 2013-06-14 16:54:32 +02:00
Matteo Beccati
6238dd6f32 Fixed bug #63186 (compile failure on netbsd) 2013-06-14 16:51:54 +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
Remi Collet
44dbe6a815 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  keep previous test to avoid any behavior change
 2013-04-02 16:31:45 +02:00
Remi Collet
731a5c5104 keep previous test to avoid any behavior change 2013-04-02 16:31:36 +02:00
Remi Collet
ce89bc8743 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix comment
  Fixed Bug #64565 copy doesn't report failure on partial copy
 2013-04-02 16:24:14 +02:00
Remi Collet
8e8a75444c fix comment 2013-04-02 16:24:00 +02:00
Remi Collet
6b4148bc97 Fixed Bug #64565 copy doesn't report failure on partial copy 
_php_stream_copy_to_stream_ex, when mmap is possible, doesn't check
if actually written bytes match read bytes.

Fix this (paranoid check) to be consistent with non mmap mode

Seems hard to add a unit test, as this rely on a full filesystem.
 2013-04-02 16:18:26 +02:00
Stanislav Malyshev
581db9c5fa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix missing parameter
 2013-01-27 17:11:36 -08:00
Andras Elso
3e6d633a0d Fix missing parameter 2013-01-27 17:11:14 -08: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
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Rasmus Lerdorf
d5fe89670e Merge branch 'PHP-5.4' into PHP-5.5 2012-12-19 23:00:41 -05:00
Rasmus Lerdorf
180b9e150b Fix for bug #63811 2012-12-19 22:58:18 -05:00
Gustavo Lopes
f8e26d95f2 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #63240 on stream_get_line()
 2012-10-12 20:24:13 +02:00
Gustavo Lopes
76601c4fd1 Fix bug #63240 on stream_get_line() 
stream_get_line() could contain the delimiter string if that string
had more than one character. The bug manifested itself when a read on
the stream ended with part of the delimiter string and the read after
would start with the rest of the delimiter string; provided that
the data of first read did not complete the max length result of the
call to stream_get_line() with the partial delimiter used in that max
length return. In that case, the delimiter will still appear in
the result, divided in two subsequent return values. That is not a bug.

See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html>
 2012-10-12 20:23:43 +02:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Gustavo Lopes
2634f55992 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #63240 on stream_get_line()
 2012-10-12 20:24:28 +02:00
Xinchen Hui
75a2c0d715 Merge branch 'PHP-5.4' 2012-10-09 13:30:22 +08:00
Stanislav Malyshev
054e41f4ae Merge branch 'PHP-5.4' 
* PHP-5.4:
  News for bug#40459
  fix bug #40459 - make all stream funcs that create object call ctor
 2012-08-09 00:12:22 -07:00
Stanislav Malyshev
4db70fd406 fix bug #40459 - make all stream funcs that create object call ctor 2012-08-07 22:59:12 -07:00
Stanislav Malyshev
c83457ed13 Merge branch 'PHP-5.4' 
* PHP-5.4:
  improve overflow checks
  add NEWS
  fix potential overflow in _php_stream_scandir
 2012-06-08 01:23:07 -07:00
Stanislav Malyshev
59eaa7c877 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  improve overflow checks
  fix potential overflow in _php_stream_scandir
 2012-06-08 01:22:46 -07:00
Stanislav Malyshev
fc74503792 improve overflow checks 2012-06-08 01:21:37 -07:00
Stanislav Malyshev
426ccd3e7f Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix potential overflow in _php_stream_scandir
 2012-06-07 23:09:37 -07:00
Stanislav Malyshev
10e8da1738 fix potential overflow in _php_stream_scandir 2012-06-07 23:09:18 -07:00
Stanislav Malyshev
7d04e0fb2e fix potential overflow in _php_stream_scandir 2012-06-07 23:08:35 -07:00
Nikita Popov
9e1b690e0c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:40:06 +02:00
Nikita Popov
bef6111609 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:33:47 +02:00
Reeze Xia
3e9923dd8d Fixed Bug #61961 (file_get_content leaks when access empty file with max length) 2012-05-06 18:27:26 +08:00
Gustavo André dos Santos Lopes
bd5f52fd94 Merge branch '5.4' 2012-04-07 16:34:37 +01:00
Gustavo André dos Santos Lopes
f7d4076785 Merge branch '5.3' into 5.4 2012-04-07 16:34:17 +01:00
Gustavo André dos Santos Lopes
0f180a63eb Fixed bug in new stream_get_line() when using NUL as a delimiter. 
This is the issue Derick spotted a few days ago..
 2012-04-07 16:32:19 +01:00