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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
583093844e
Fixed hex char parsing
2020-09-30 11:00:25 +03:00
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
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
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
1616363850
Fixed incorrect error message
2020-09-30 08:37:16 +03:00
662083fc4f
bump version to 7.2.35-dev
2020-09-30 07:36:59 +02:00
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
3f5c47af3b
Fixed incorrect logical condition
2020-09-30 08:29:00 +03:00
a1cee97de1
Fixed incorrect logical conditions
2020-09-30 08:21:46 +03:00
f20a2b4f3c
[ci skip] Add 7.4.11 security fixes to NEWS
2020-09-29 10:13:38 -07:00
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
ae95d06f68
[ci skip] Add 7.3.23 security fixes to NEWS
2020-09-29 10:09:33 -07:00
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
b5cb999e7f
[ci skip] Fix version
2020-09-29 12:10:51 +02:00
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
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
3928b6b435
Fixed unintended disabling of Optimizer for preloaded scripts introduced by 4a2646cf45
2020-09-29 12:11:01 +03:00
e08f69194c
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix #80150 : Failure to fetch error message
2020-09-29 11:04:09 +02:00
df5efa2fcd
Fix #80150 : Failure to fetch error message
...
In case of statement related errors, we need to pass the respective
statement handle to `SQLError()`.
Closes GH-6217.
2020-09-29 11:02:51 +02:00
1fafcd2b28
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix bug #80137
Fix bug #80138
2020-09-29 10:59:32 +02:00
f5afd0a827
Fix bug #80137
...
Skip getprotobyname() and getprotobynumber() tests on *nix if there
is no /etc/protocols file.
Closes GH-6193.
2020-09-29 10:58:00 +02:00
2899137391
Fix bug #80138
...
Skip getservbyname() and getservbyport() tests on *nix if there is
no /etc/services file.
Closes GH-6191.
2020-09-29 10:57:20 +02:00
205556c191
Synchronize php.ini-development and php.ini-production
...
Closes GH-6231.
2020-09-29 10:47:09 +02:00
e5b045e6b6
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
[ci skip] typo
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
2020-09-29 08:51:03 +02:00
035ad0aed5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
[ci skip] typo
Update NEWS & UPGRADING
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
2020-09-29 08:50:14 +02:00
af500b8685
[ci skip] typo
2020-09-29 08:49:56 +02:00
c4dc080245
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Update UPGRADING
Update NEWS & UPGRADING
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
2020-09-28 22:54:57 -07:00
95e1a415a5
Do not decode cookie names anymore
2020-09-28 21:43:11 -07:00
2f5cb702ff
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
2020-09-28 21:43:11 -07:00
a9e4321846
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS & UPGRADING
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
2020-09-28 21:39:34 -07:00
626705fb9d
Update UPGRADING
2020-09-28 21:39:20 -07:00
311922ddbe
Update UPGRADING
2020-09-28 21:38:58 -07:00
7bc112a142
Update NEWS & UPGRADING
2020-09-28 21:38:43 -07:00
Christoph M. Becker