php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 21:41:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
122,127 Commits 547 Branches 1,483 Tags
4dca1140cff1d4c8d6568b2ee6a409a74ce838ac
Commit Graph

122127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Zelenka
4dca1140cf Merge branch 'PHP-7.4' into PHP-8.0 2021-03-21 21:21:05 +00:00
Jakub Zelenka
bc7ea73da5 Use ServerClientTestCase in a test for default_socket_timeout=-1 2021-03-21 21:19:40 +00:00
Jakub Zelenka
713b82131b Merge branch 'PHP-7.4' into PHP-8.0 2021-03-21 19:00:38 +00:00
Jakub Zelenka
538f95b1b7 Fix NEWS entry position for the latest FPM fix 2021-03-21 18:58:57 +00:00
Jakub Zelenka
c483b59124 Fix bug #80024: Duplication of info about inherited socket after pool removing 2021-03-21 18:52:07 +00:00
Christoph M. Becker
2a1ed81ffc Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80889: Cannot set save handler when save_handler is invalid
 2021-03-19 17:03:54 +01:00
Christoph M. Becker
06bfada99b Fix #80889: Cannot set save handler when save_handler is invalid 
There is no need to require a (valid) save_handler to be set, when a
user handler is supposed to be set.  We just have to make sure, that
no user handler is already set in this case.

Closes GH-6788.
 2021-03-19 16:59:54 +01:00
Christoph M. Becker
97cfdcd73b Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80783: PDO ODBC truncates BLOB records at every 256th byte
 2021-03-18 15:18:53 +01:00
Christoph M. Becker
bccca0b53a Fix #80783: PDO ODBC truncates BLOB records at every 256th byte 
It is not guaranteed, that the driver inserts only a single NUL byte at
the end of the buffer.  Apparently, there is no way to find out the
actual data length in the buffer after calling `SQLGetData()`, so we
adjust after the next `SQLGetData()` call.

We also prevent PDO::ODBC_ATTR_ASSUME_UTF8 from fetching garbage, by
fetching all chunks with the same C type.

Closes GH-6716.
 2021-03-18 15:13:27 +01:00
Dmitry Stogov
465cfc499b Additional fix for bug #80847. 
On x86_64 part of structure may be passed in CPU registers.
 2021-03-18 16:13:42 +03:00
Nikita Popov
4dce2f83f5 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix locale switch back to C in pcre
 2021-03-18 10:50:57 +01:00
Nikita Popov
4be867e910 Fix locale switch back to C in pcre 
The compile context is shared between patterns, so we need to set
the character tables unconditionally in case we switched from
a non-C locale to the C locale.
 2021-03-18 10:48:43 +01:00
Dmitry Stogov
7e494d9225 Fixed bug #80861 (erronous array key overflow in 2D array with JIT) 2021-03-17 22:59:59 +03:00
Nikita Popov
34e39ebaf5 Fix signed/unsigned warnings in PDO ODBC 
Add add skipif to test.

(cherry picked from commit aa58db7232)
 2021-03-17 16:33:32 +01:00
Nikita Popov
d80118dc16 imagecolortransparent() cannot return null 2021-03-17 15:09:06 +01:00
Nikita Popov
c17434429d Return bool from imageinterlace() 
The function accepts a bool since PHP 8.0, so it should also return
a bool to keep things consistent.

Furthermore a null return from this functions is not possible.
 2021-03-17 15:05:09 +01:00
Dmitry Stogov
faf1567212 Fixed bug #80839 (PHP problem with JIT) 2021-03-17 16:55:09 +03:00
Christoph M. Becker
fddd0ac552 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #66783: UAF when appending DOMDocument to element
 2021-03-17 12:40:03 +01:00
Christoph M. Becker
a08847ab39 Fix #66783: UAF when appending DOMDocument to element 
According to the DOM standard, elements may only contain element, text,
processing instruction and comment nodes[1].  It is also specified that
a HierarchyRequestError should be thrown if a document is to be
inserted[2].  We follow that standard, and prevent the use-after-free
this way.

[1] <https://dom.spec.whatwg.org/#node-trees>
[2] <https://dom.spec.whatwg.org/#mutation-algorithms>

Closes GH-6765.
 2021-03-17 12:37:18 +01:00
Christoph M. Becker
c7fadd2328 8.0.5 is next 
We also move the NEWS entry for bug 80847 to the proper version.
 2021-03-17 12:14:26 +01:00
Dmitry Stogov
38ebb55c7c Fixed bug #80847 (CData structs with fields of type struct can't be passed as C function argument) 2021-03-17 09:55:20 +03:00
Nikita Popov
82622d7583 Fix refcount inference for typed properties 
We were not adding RC1/RCN if the MAY_BE_OBJECT came from a class
type and there was no other refcounted type in the union.
 2021-03-16 11:17:18 +01:00
Derick Rethans
c2ff964de0 Merge branch 'PHP-7.4' into PHP-8.0 2021-03-16 09:41:40 +00:00
Derick Rethans
4adc08a403 Fix build version too 2021-03-16 09:41:21 +00:00
Derick Rethans
7dbe27222c Merge branch 'PHP-7.4' into PHP-8.0 2021-03-16 09:40:21 +00:00
Derick Rethans
5e4ee3d0bd NEWS for 7.4.18 2021-03-16 09:40:05 +00:00
Derick Rethans
eb1d1fe373 Prepare for 7.4.17RC1 2021-03-16 09:33:33 +00:00
Máté Kocsis
465aa1d38f Fix ldap_next_entry() parameter name 2021-03-16 09:31:46 +01:00
Máté Kocsis
b03438ba3a Fix crash in LDAP search functions during argument validation 2021-03-16 09:31:37 +01:00
Máté Kocsis
5ecc078a17 Add missing skipif sections to ext/dom tests 2021-03-15 23:45:37 +01:00
Christoph M. Becker
eae69fcf71 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80817: dba_popen() may cause segfault during RSHUTDOWN
 2021-03-15 18:39:26 +01:00
Christoph M. Becker
f448b0e6dd Fix #80817: dba_popen() may cause segfault during RSHUTDOWN 
We need to close persistent streams with the proper flag.
 2021-03-15 18:37:44 +01:00
Nikita Popov
50254de0a2 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix bug #80866
 2021-03-15 14:48:02 +01:00
Dharman
282355efd5 Fix bug #80866 
Closes GH-6774.
 2021-03-15 14:47:45 +01:00
Nikita Popov
6493b516f9 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix bug #80837
 2021-03-15 14:38:49 +01:00
Dharman
c93b461ad7 Fix bug #80837 
The error needs to be reported on the statement, not the connection.
 2021-03-15 14:38:09 +01:00
Nikita Popov
3306baca50 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Update ubuntu on i386 job
  Downgrade security level in tests using TLS < 1.2
 2021-03-15 14:12:42 +01:00
Nikita Popov
fc4cd598a2 Update ubuntu on i386 job 
There is a failure with apt on PHP-7.4 that's not present on
PHP-8.0/master. Switching to a newer ubuntu version on PHP-7.4
avoids the issue.
 2021-03-15 14:11:19 +01:00
Nikita Popov
703bbf5210 Downgrade security level in tests using TLS < 1.2 
A few additional tests have been added on master that require
lower security level.

(cherry picked from commit c2a6395dcb)
 2021-03-15 14:11:12 +01:00
Michael Heimpold
eaf9421df6 ext/opcache: fix configure output while checking mmap MAP_ANON support 
It seems that f3efb9e3fb introduced a "typo" which may result
in the following confusing message:

checking for mmap() using MAP_ANON shared memory support... no=yes

Let's fix this.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Closes GH-6758.
 2021-03-15 10:52:57 +01:00
Dmitry Stogov
3b377b51a2 Fixed bug #80814 (threaded mod_php won't load on FreeBSD: No space available for static Thread Local Storage) 2021-03-10 16:03:47 +03:00
Christoph M. Becker
7931956805 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #51903: simplexml_load_file() doesn't use HTTP headers
 2021-03-08 15:15:59 +01:00
Christoph M. Becker
f901bec494 Fix #51903: simplexml_load_file() doesn't use HTTP headers 
The `encoding` attribute of the XML declaration is optional; it is good
practice to use external encoding information where available if it is
missing.  Thus, we check for `charset` info of `Content-Type` headers,
and see whether the encoding is supported.

We cater to trailing parameters and quoted-strings, but not to escaped
backslashes and quotes in quoted-strings, since no known character
encoding contains these anyway.

Co-authored-by: Michael Wallner <mike@php.net>

Closes GH-6747.
 2021-03-08 15:07:01 +01:00
Christoph M. Becker
3880b8785b Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80838: HTTP wrapper waits for HTTP 1 response after HTTP 101
 2021-03-08 14:51:45 +01:00
manuel
5787f91c55 Fix #80838: HTTP wrapper waits for HTTP 1 response after HTTP 101 
Don't wait for further responses after a HTTP 101 (Switching Protocols) response

Closes GH-6730.
 2021-03-08 14:36:31 +01:00
Máté Kocsis
0f8312342f Fix the error message of attribute flag validation 2021-03-06 00:56:25 +01:00
George Wang
8462a3de1a Merge branch 'PHP-7.4' into PHP-8.0 2021-03-05 11:00:53 -05:00
George Wang
8fc0bdfb0a Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4 2021-03-05 10:57:46 -05:00
George Wang
797edd6211 LiteSpeed SAPI v7.9: Process manager keeps forked child process alive for longer time based on load. Reduces PM overhead for busy setup. 2021-03-05 10:46:12 -05:00
David Carlier
ae23852e41 Add supports for FreeBSD's PROT_MAX to let mprotect knows X flag can be applied in addition. 
Closes GH-6738.
 2021-03-05 16:44:08 +01:00