php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 03:22:58 +02:00
Code Issues Packages Projects Releases Wiki Activity
114,233 Commits 547 Branches 1,483 Tags
2b3b7f5cd97f3fdcd4fcaada212101975a289d06
Commit Graph

52139 Commits

Author SHA1 Message Date
Nikita Popov
2b3b7f5cd9 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #79410 (system() swallows last chunk if it is exactly 4095 bytes without newline)
 2020-03-25 10:51:23 +01:00
Christian Schneider
c0840fec9c Fix bug #79410 (system() swallows last chunk if it is exactly 4095 bytes without newline) 
Closes GH-5292.
 2020-03-25 10:50:35 +01:00
Nikita Popov
534e15b477 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Add test file
 2020-03-23 17:14:16 +01:00
Nikita Popov
2e8db5d6be Add test file 
Forgot the git add again...
 2020-03-23 17:13:57 +01:00
Nikita Popov
dd9b5c8680 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Handle NULL caller_call_opline
 2020-03-23 17:12:12 +01:00
Nikita Popov
34f1266a9c Handle NULL caller_call_opline 
This can happen if there is an EXIT in the call arguments, in which
case the DO_CALL opcode may be eliminated as unreachable.
 2020-03-23 17:12:01 +01:00
Christoph M. Becker
0afdf194f0 Fix leak on Windows as well 
Cf. <http://git.php.net/?p=php-src.git;a=commit;h=db08ef0d3274b239a6b9e68d71d02bb6acb71d82>
 2020-03-23 16:32:52 +01:00
Christoph M. Becker
efbc962c92 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix test for Windows
 2020-03-23 16:23:33 +01:00
Christoph M. Becker
ba404f21e4 Fix test for Windows 
Windows filenames may very well contain a colon, so we adjust the test
accordingly.
 2020-03-23 16:22:45 +01:00
Christoph M. Becker
a7bbfc95eb Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79200: Some iconv functions cut Windows-1258
 2020-03-23 14:13:42 +01:00
Christoph M. Becker
32a2644305 Fix #79200: Some iconv functions cut Windows-1258 
To cater to potentially state-dependent encodings, we have to reset the
conversion descriptor into its initial shift state to properly finish
the conversion.  Furthermore, state-dependent encodings may not show
progress when comparing `in_left` before and after the conversion; we
rather have to see whether `out_left` has decreased.  Also we have to
cater to the fact that the final potentially state resetting call does
not signal failure, but we still have to break respective loops
afterwards.
 2020-03-23 14:12:37 +01:00
Christoph M. Becker
4576da0aa7 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79393: Null coalescing operator failing with SplFixedArray
 2020-03-23 13:31:25 +01:00
Christoph M. Becker
47c745555c Fix #79393: Null coalescing operator failing with SplFixedArray 
We favor the KISS principle over optimization[1] – SPL is already
special enough.

[1] <352f3d4476 (r112498098)>ff
 2020-03-23 13:29:25 +01:00
Nikita Popov
db08ef0d32 Fix RSA memory leak in mysqlnd auth 2020-03-23 11:55:22 +01:00
Remi Collet
347d18b48e unneeded after fix 2020-03-20 11:18:52 +01:00
Remi Collet
98687abb1d Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  NEWS
  Fix Bug #79296 ZipArchive::open fails on empty file
 2020-03-20 11:16:38 +01:00
Remi Collet
8aab43c85d Fix Bug #79296 ZipArchive::open fails on empty file 2020-03-20 11:14:58 +01:00
Christoph M. Becker
9e6d80dc8f Fix potential test conflict 
Cf. <https://ci.appveyor.com/project/php/php-src/builds/31564684/job/k9u3xv860fao3n2e#L5578>
 2020-03-20 08:56:40 +01:00
Christoph M. Becker
1d9e716a47 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79396: DateTime hour incorrect during DST jump forward
 2020-03-19 08:51:55 +01:00
Nate Brunette
d70058a139 Fix #79396: DateTime hour incorrect during DST jump forward 
When you attempt to set the time to a non-existent time occuring during
a DST jump forward, the hour does not move forward correctly.
 2020-03-19 08:50:34 +01:00
Christoph M. Becker
280485adc1 Improve FFI test suite for Windows 
We add Windows support to four existing test cases, extract some useful
utility functions, and use them to simplify further test cases.

We also remove the Windows specific code from preload.inc, since
preloading isn't supported on Windows anyway.
 2020-03-18 16:53:06 +01:00
Nikita Popov
ba6834fa57 Make bug52820.phpt more robust 
Use a more robust error condition...
 2020-03-18 11:46:27 +01:00
Stanislav Malyshev
1599f440a5 Fix test 2020-03-16 22:40:48 -07:00
Stanislav Malyshev
335547a04d Fix bug #79329 - get_headers should not accept \0 2020-03-16 22:40:48 -07:00
Stanislav Malyshev
b9d32197cb Fixed bug #79282 2020-03-16 22:40:48 -07:00
Christoph M. Becker
aa88f33f7d Fix #79283: Segfault in libmagic patch contains a buffer overflow 
To solve this, we properly calculate the required string length upfront
instead of allocating an oversized string (`len * 4 + 4`).
 2020-03-16 22:40:48 -07:00
Christoph M. Becker
db848e1482 Fix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow 
We make sure that negative values are properly compared.
 2020-03-16 22:40:48 -07:00
Stanislav Malyshev
62e7b80267 Fix test 2020-03-16 22:40:00 -07:00
Stanislav Malyshev
69fdc14152 Fix bug #79329 - get_headers should not accept \0 2020-03-16 22:40:00 -07:00
Stanislav Malyshev
25238bdf60 Fixed bug #79282 2020-03-16 22:40:00 -07:00
Christoph M. Becker
1fdffd1c55 Fix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow 
We make sure that negative values are properly compared.
 2020-03-16 22:40:00 -07:00
Nikita Popov
a57905dbac Don't specify ports in socket_export_stream-4.phpt 
Let the system pick a free port instead...
 2020-03-16 10:32:04 +01:00
Dmitry Stogov
b6492b4453 identation fix 2020-03-12 22:26:16 +03:00
Dmitry Stogov
3c6e9bed1a Call global code of preloaded script in global context 2020-03-12 22:19:47 +03:00
Dmitry Stogov
2dddab01ae Avoid "Anonymous class wasn't preloaded" error by lazely loading of not preloaded part of a preloaded script 2020-03-12 16:31:24 +03:00
Christoph M. Becker
ddc3f3d595 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79199: curl_copy_handle() memory leak
 2020-03-12 11:27:45 +01:00
Christoph M. Becker
2b5fc8e325 Fix #79199: curl_copy_handle() memory leak 
`curl_copy_handle()` already registers a new resource, so we must not
increase the refcount of the original resource.
 2020-03-12 11:23:53 +01:00
Christoph M. Becker
2b56735ea0 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #61597: SXE properties may lack attributes and content
 2020-03-12 10:56:13 +01:00
Christoph M. Becker
7c081db885 Fix #61597: SXE properties may lack attributes and content 
We must not treat a node as string if it has attributes, unless it is
an entity declaration which is always treated as string by simplexml.
 2020-03-12 10:52:28 +01:00
Dmitry Stogov
fee614f66b Export FFI::__BIGGEST_ALIGNMENT__ 2020-03-12 11:43:01 +03:00
Dmitry Stogov
ecdaf83f5f Allow to fetch function address 2020-03-12 11:40:48 +03:00
Xinchen Hui
22c83454d6 Folder mark missed 2020-03-12 15:43:15 +08:00
Dmitry Stogov
c45552e32b Export FFI::__BIGGEST_ALIGNMENT__ 2020-03-11 15:29:58 +03:00
Dmitry Stogov
e902e4acd9 Allow to fetch function address 2020-03-11 15:13:27 +03:00
Christoph M. Becker
8657f03084 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78210: Invalid pointer address
 2020-03-11 11:31:26 +01:00
Christoph M. Becker
53797c206a Fix #78210: Invalid pointer address 
This is actually about three distinct issues:

* If an empty string is passed as $address to `stream_socket_sendto()`,
  the `sa` is not initialized, so we must not pass it as `addr` to
  `php_stream_xport_sendto()`.

* On POSIX, `recvfrom()` truncates messages which are too long to fit
  into the specified buffer (unless `MSG_PEEK` is given), discards the
  excessive bytes, and returns the buffer length.  On Windows, the same
  happens, but `recvfrom()` returns `SOCKET_ERROR` with the error code
  `WSAEMSGSIZE`.  We have to catch this for best POSIX compatibility.

* In `php_network_parse_network_address_with_port()`, we have to zero
  `in6` (not only its alias `sa`) to properly support IPv6.

Co-Authored-By: Nikita Popov <nikita.ppv@googlemail.com>
 2020-03-11 11:30:15 +01:00
Peter Seiderer
f73528f0e0 Check for sys/auxv.h before using it. 
Fixes aarch64 compile with uclibc-ng (does not provide
sys/auxv.h header file).

Closes GH-5248.

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
 2020-03-10 16:53:57 +01:00
Christoph M. Becker
fea2994ff8 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Enclose INI values containing {TMP} in quotes
 2020-03-09 22:51:11 +01:00
Christoph M. Becker
d5e206620b Enclose INI values containing {TMP} in quotes 
At least on Windows, the temporary directory may contain tilde signs,
which would result in an INI parse error.
 2020-03-09 22:49:08 +01:00
Nikita Popov
760faa12b2 Fixed bug #79357 
Peculiarly, for once the cause was not SOAPs "interesting" error
handling, but a bug in the call trampoline for internal functions...
 2020-03-09 15:01:31 +01:00