php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
114,903 Commits 549 Branches 1,485 Tags
b2b9e2e87e780d814ffc6ceeaf1b546a14e76799
Commit Graph

114903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker b2b9e2e87e Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #80213: imap_mail_compose() segfaults on certain $bodies
 2020-10-10 19:18:14 +02:00
Christoph M. Becker 8bee0fbd37 Fix #80213: imap_mail_compose() segfaults on certain $bodies 
We have to cater to non-associative arrays where the key may be `NULL`;
we just skip these elements.

Closes GH-6315.
 2020-10-10 19:17:13 +02:00
Nikita Popov 82e5752b0b Don't specify symfony branch 
This was renamed from master to 5.x. Just use the default branch.
 2020-10-10 11:07:49 +02:00
Nikita Popov 15443f8af4 Fixed bug #80186 
Early exit in FE_RESET if get_properties() returns empty array,
as we cannot add HT iterators to zend_empty_array.
 2020-10-09 16:56:08 +02:00
Nikita Popov 58af1e156e Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Make iconv errno support test pass on Solaris.
 2020-10-09 15:24:53 +02:00
Petr Sumbera 07a4185df1 Make iconv errno support test pass on Solaris. 
Closes GH-6291.
 2020-10-09 15:24:36 +02:00
Nikita Popov 229eb15f0e Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  XFAIL test broken by timelib update
 2020-10-09 14:05:23 +02:00
Nikita Popov 5018581410 XFAIL test broken by timelib update 
I was expecting this to get fixed quickly, but it didn't.
XFAIL for now.
 2020-10-09 14:04:47 +02:00
Derick Rethans 950157942e Updated to version 2020.2 (2020b) 2020-10-08 15:19:47 +01:00
Derick Rethans 8227a5ff45 Empty merge 2020-10-08 15:19:47 +01:00
Derick Rethans 14d231bd16 Updated to version 2020.2 (2020b) 2020-10-08 15:19:46 +01:00
Derick Rethans c8929dc17e Updated to version 2020.2 (2020b) 2020-10-08 15:05:39 +01:00
Derick Rethans a2e7b31fac Empty merge 2020-10-08 15:05:39 +01:00
Derick Rethans 90a5d7c2ad Updated to version 2020.2 (2020b) 2020-10-08 15:05:38 +01:00
Christoph M. Becker 2e7247c558 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix too strict imap test expectations
 2020-10-08 12:08:35 +02:00
Christoph M. Becker 1895bf7b94 Fix too strict imap test expectations 2020-10-08 12:06:54 +02:00
Christoph M. Becker ff3878adeb Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #77040: tidyNode::isHtml() is completely broken
 2020-10-07 17:48:12 +02:00
Christoph M. Becker e68acd031d Fix #77040: tidyNode::isHtml() is completely broken 
The documentation of `tidyNode::isHtml()` states that this method
"checks if a node is part of a HTML document".  That is, of course,
nonsense, since a tidyNode is "an HTML node in an HTML file, as
detected by tidy."

What this method is actually supposed to do is to check whether a node
is an element (unless it is the root element).  This has been broken by
commit d8eeb8e[1], which assumed that `enum TidyNodeType` would
represent flags of a bitmask, what it does not.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=d8eeb8e28673236bca3f066ded75037a5bdf6378>

Closes GH-6290.
 2020-10-07 17:43:56 +02:00
Nikita Popov 683c988493 Fixed bug #80194 
We should strip NOPs from unreachable_free blocks as well, to make
sure that the free really is the first op.
 2020-10-07 15:03:12 +02:00
Christoph M. Becker 9dddfbe755 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #80185: jdtounix() fails after 2037
 2020-10-07 13:25:11 +02:00
Christoph M. Becker e857dfa7cc Fix #80185: jdtounix() fails after 2037 
There is no such thing as the "end of the unix epoch", and if it was,
it would certainly not be 2037-10-11T02:00:00.  There is, however,
potential integer overflow which we need to avoid.

Closes GH-6288.
 2020-10-07 13:23:50 +02:00
Nikita Popov 3b7c8bb973 Fix bug #80126 
When performing an unlinked instanceof, we also need to consider
interfaces of parent classes, as they may not have been inherited
yet.
 2020-10-06 16:33:14 +02:00
Christoph M. Becker c6e7969f05 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #46050: odbc_next_result corrupts prepared resource
 2020-10-05 17:47:35 +02:00
Christoph M. Becker 69ba81d183 Fix #46050: odbc_next_result corrupts prepared resource 
When resetting the result's values, we also have to reset its numcols.
 2020-10-05 17:46:37 +02:00
Nikita Popov 9ad5381a2f Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix -Wimplicit-function-declaration in configure
 2020-10-05 10:46:46 +02:00
Nikita Popov aa405b7da2 Fix -Wimplicit-function-declaration in configure 
As this is an error with xcode 12, see bug #80171.
 2020-10-05 10:43:58 +02:00
Christoph M. Becker c00816a38f Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix out-of-bounds write
 2020-10-02 15:04:38 +02:00
K.Kosako bf6873a18e Fix out-of-bounds write 
Fixes CVE-2020-26159.

Backported from <https://github.com/kkos/oniguruma/commit/cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0>.
 2020-10-02 15:02:35 +02:00
Matteo Beccati 7c48479f62 [ci skip] moved soap fix to 7.4.11 
When committing I didn't notice that version had been just bumped
 2020-10-02 09:33:50 +02:00
Matteo Beccati 233b66c3d2 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  [ci skip] moved soap fix to 7.3.23
 2020-10-02 09:33:20 +02:00
Matteo Beccati 1666cfcca0 [ci skip] moved soap fix to 7.3.23 
When committing I didn't notice that version had been just bumped
 2020-10-02 09:32:52 +02:00
Dmitry Stogov 59f497afac Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Backport of a partial fix for bug Bug #76982 (memory leak declaring closure in included file).
 2020-10-01 13:19:27 +03:00
Dmitry Stogov 773f980e00 Backport of a partial fix for bug Bug #76982 (memory leak declaring closure in included file). 2020-10-01 13:18:21 +03:00
Dmitry Stogov 583093844e Fixed hex char parsing 2020-09-30 11:00:25 +03:00
Remi Collet fd4b072991 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  bump version to 7.2.35-dev
 2020-09-30 07:42:28 +02:00
Remi Collet 5733f11ee9 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  bump version to 7.2.35-dev
 2020-09-30 07:42:14 +02:00
Dmitry Stogov 2a0e4b88fd Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed incorrect error message
 2020-09-30 08:37:35 +03:00
George Peter Banyard 1616363850 Fixed incorrect error message 2020-09-30 08:37:16 +03:00
Remi Collet 662083fc4f bump version to 7.2.35-dev 2020-09-30 07:36:59 +02:00
Dmitry Stogov 6f0b232648 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed incorrect logical condition
 2020-09-30 08:29:21 +03:00
George Peter Banyard 3f5c47af3b Fixed incorrect logical condition 2020-09-30 08:29:00 +03:00
George Peter Banyard a1cee97de1 Fixed incorrect logical conditions 2020-09-30 08:21:46 +03:00
Stanislav Malyshev f20a2b4f3c [ci skip] Add 7.4.11 security fixes to NEWS 2020-09-29 10:13:38 -07:00
Stanislav Malyshev 5c8b02fdd6 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  [ci skip] Add 7.3.23 security fixes to NEWS
 2020-09-29 10:11:52 -07:00
Stanislav Malyshev ae95d06f68 [ci skip] Add 7.3.23 security fixes to NEWS 2020-09-29 10:09:33 -07:00
Christoph M. Becker 2bceb4bedc Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  [ci skip] Fix version
 2020-09-29 12:12:21 +02:00
Christoph M. Becker b5cb999e7f [ci skip] Fix version 2020-09-29 12:10:51 +02:00
Christoph M. Becker b87e43d931 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #80152: odbc_execute() moves internal pointer of $params
 2020-09-29 11:35:41 +02:00
Christoph M. Becker bf5f07cc8b Fix #80152: odbc_execute() moves internal pointer of $params 
As least intrusive fix, we separate the passed array argument.

Closes GH-6219.
 2020-09-29 11:34:48 +02:00
Dmitry Stogov 3928b6b435 Fixed unintended disabling of Optimizer for preloaded scripts introduced by 4a2646cf45 2020-09-29 12:11:01 +03:00