php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
122,255 Commits 547 Branches 1,481 Tags
220ffb90d05f5d1c19b76ac87d64adcbdf6ddf3b
Commit Graph

122255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
220ffb90d0 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  fetch_assoc may return array_key_long
 2021-04-28 11:20:38 +02:00
Nikita Popov
67c4d1f5b9 fetch_assoc may return array_key_long 
If the column name is a number (which is possible at least via
AS clauses), then symtable canonicalization will convert it into
an integer key.
 2021-04-28 11:18:36 +02:00
Nikita Popov
76d1120a48 Remove assert_options() return value info 
The ASSERT_CALLBACK value is not validated at all -- it's possible
to set it to an arbitrary value. As such, the function can also
return any value or type (even without outright abuse, the opcache
func info was wrong in that the return can be rcn, and the array
can be array_of_ref).
 2021-04-28 11:05:05 +02:00
Nikita Popov
af9fadc55a Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  password_get_info() may return array_of_null
 2021-04-28 10:55:43 +02:00
Nikita Popov
c340f97ab0 password_get_info() may return array_of_null 
The algo key is set to null if the algorithm can't be detected.
 2021-04-28 10:54:31 +02:00
Nikita Popov
4a5bda6a8d Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  getdate() may return array_key_long
 2021-04-28 10:47:45 +02:00
Nikita Popov
c7387ab92f getdate() may return array_key_long 
This function mostly uses string keys, but the timestamp is
returned at key 0 (why???)
 2021-04-28 10:46:37 +02:00
Nikita Popov
98a071e880 pg_connect() may return rcn 
Without CONNECT_FORCE_NEW, pg_connect() may resuse an existing
connection and refcount may be larger than one.
 2021-04-28 10:36:48 +02:00
Nikita Popov
9ce5776922 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Remove incorrect format argument
 2021-04-27 22:23:06 +02:00
Nikita Popov
3f71ba2611 Remove incorrect format argument 
rc is not used by the printf format.
 2021-04-27 22:22:32 +02:00
Christoph M. Becker
4c80e439a8 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80460: ODBC doesn't account for SQL_NO_TOTAL indicator
 2021-04-27 17:12:01 +02:00
Christoph M. Becker
7f83976200 Fix #80460: ODBC doesn't account for SQL_NO_TOTAL indicator 
The `StrLen_or_IndPtr` parameter usually may be `SQL_NO_TOTAL`; we need
to cater to that possibility to avoid working with negative string
lengths and other issues.  A noteable exemption are calls to
`SQLGetData()` which return `SQL_SUCCESS`; in that case `SQL_NO_TOTAL`
can not occur.

Closes GH-6809.
 2021-04-27 17:09:36 +02:00
Christoph M. Becker
606b2c39fc Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  7.3.29 is next
 2021-04-27 16:58:32 +02:00
Christoph M. Becker
66308af539 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  7.3.29 is next
 2021-04-27 16:56:53 +02:00
Christoph M. Becker
98c8ad9218 7.3.29 is next 2021-04-27 16:55:20 +02:00
Christoph M. Becker
e1f8763a2c Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix ./makedist wrt. to GH move
 2021-04-27 15:50:54 +02:00
Christoph M. Becker
20b62ade29 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix ./makedist wrt. to GH move
 2021-04-27 15:49:59 +02:00
Christoph M. Becker
096f148c61 Fix ./makedist wrt. to GH move 
We can no longer export from git.php.net, and apparently exporting from
Github is not supported.  We apply a quick fix to export from the local
clone by default, still leaving an option to export from some other
repo.  This is, unfortunately, a minor BC break in a security release.

Co-authored-by: Remi Collet <remi@php.net>

Closes GH-6919.
 2021-04-27 15:48:58 +02:00
Christoph M. Becker
3e518e069d Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Add missing NEWS entry for #80710
 2021-04-27 13:43:12 +02:00
Christoph M. Becker
12e15be921 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Add missing NEWS entry for #80710
 2021-04-27 13:41:20 +02:00
Christoph M. Becker
60a68a45c3 Add missing NEWS entry for #80710 2021-04-27 13:38:39 +02:00
Nikita Popov
7544f66da9 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix build warning
 2021-04-27 10:10:55 +02:00
Nikita Popov
310c0561a9 Fix build warning 
This causes the build to fail on PHP-8.0 and higher.
 2021-04-27 10:10:22 +02:00
Stanislav Malyshev
a4d9ccbcd6 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80710: imap_mail_compose() header injection
 2021-04-26 21:49:38 -07:00
Stanislav Malyshev
568df31698 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #80710: imap_mail_compose() header injection
 2021-04-26 21:48:16 -07:00
Christoph M. Becker
37962c61d2 Fix #80710: imap_mail_compose() header injection 
Like `mail()` and `mb_send_mail()`, `imap_mail_compose()` must prevent
header injection.  For maximum backward compatibility, we still allow
header folding for general headers, and still accept trailing line
breaks for address lists.
 2021-04-26 21:43:03 -07:00
Stanislav Malyshev
eed03fce59 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"
 2021-04-26 21:02:09 -07:00
Stanislav Malyshev
2b3346208a Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"
 2021-04-26 21:02:03 -07:00
Stanislav Malyshev
1b88c85cd8 Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement" 
Sorry, this solution seems to have BC breaks, will need to look
for better one.

This reverts commit 9f7e8b777c.
 2021-04-26 21:01:25 -07:00
Stanislav Malyshev
6de2d54425 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement
 2021-04-26 20:50:29 -07:00
Stanislav Malyshev
76637017ac Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement
 2021-04-26 20:50:15 -07:00
Christoph M. Becker
9f7e8b777c Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement 
We ignore `XML_ENTITY_DECL` nodes when getting the hash of the
properties of a `SimpleXMLElement`.
 2021-04-26 20:43:45 -07:00
Máté Kocsis
d1e590fe72 Fix pg_get_notify() parameter name 
Closes GH-6916
 2021-04-26 19:37:41 +02:00
Christoph M. Becker
2bce26f2aa Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80901: Info leak in ftp extension
 2021-04-26 15:08:44 +02:00
Christoph M. Becker
c0ae3a7fb7 Fix #80901: Info leak in ftp extension 
We ensure that inbuf is NUL terminated on `ftp_readline()` failure.

Closes GH-6894.
 2021-04-26 15:07:08 +02:00
Christoph M. Becker
bc6fc61c04 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix typo in NEWS
 2021-04-26 15:03:10 +02:00
Christoph M. Becker
7f9183ce20 Fix typo in NEWS 2021-04-26 15:02:13 +02:00
Christoph M. Becker
361df6d39c Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix Bug #80972: Memory exhaustion on invalid string offset
 2021-04-26 14:59:18 +02:00
Christoph M. Becker
33d49551d1 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80901: Info leak in ftp extension
 2021-04-26 14:45:55 +02:00
Christoph M. Becker
09696eee9d Fix #80901: Info leak in ftp extension 
We ensure that inbuf is NUL terminated on `ftp_readline()` failure.

Closes GH-6894.
 2021-04-26 14:23:04 +02:00
George Peter Banyard
97f8ca52fa Fix Bug #80972: Memory exhaustion on invalid string offset 
Closes GH-6909
 2021-04-26 13:22:12 +01:00
George Peter Banyard
418fcd22e8 Fix Bug #80972: Memory exhaustion on invalid string offset 
Closes GH-6890
 2021-04-26 13:21:40 +01:00
Christoph M. Becker
fe219d912e Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Export gzfwrite()
 2021-04-26 12:12:04 +02:00
Christoph M. Becker
a2771296c0 Export gzfwrite() 
Extensions calling `gzfwrite()` cannot be built when linked against
php.dll (built with zlib support) otherwise.

Closes GH-6880.
 2021-04-26 12:09:31 +02:00
Máté Kocsis
cb84e5c332 Fix arginfo/ZPP mismatch for simplexml_import_dom 
Closes GH-6905
 2021-04-26 11:09:30 +02:00
Christoph M. Becker
23a192d12d Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #67792: HTTP Authorization schemes are treated as case-sensitive
 2021-04-23 15:57:11 +02:00
Christoph M. Becker
39ddf6b89c Fix #67792: HTTP Authorization schemes are treated as case-sensitive 
We use `zend_binary_strncasecmp()` to avoid any locale issues, and
refactor.  We also add a test case for Digest authentication.

Closes GH-6900.
 2021-04-23 15:54:17 +02:00
Nikita Popov
b0f030509a Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  PHPDBG: fix bug parsing 3-word opcodes
 2021-04-22 10:12:25 +02:00
David Rans
054fad6d63 PHPDBG: fix bug parsing 3-word opcodes 
PHPDBG won't parse opcodes correctly if they are more than two words
separated by underscores (as many opcodes, like ZEND_POST_INC, are).

Now opcodes that have more than one underscore (e.g. ZEND_POST_INC) are
parsed correctly.

Closes GH-6895.
 2021-04-22 10:11:26 +02:00
Christoph M. Becker
3c6480552d Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix php_pgsql_fd_cast() wrt. php_stream_can_cast()
 2021-04-20 18:30:25 +02:00