php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-11 18:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
122,273 Commits 547 Branches 1,483 Tags
bb0107b63dec8de5b0f3c3f535d3c52c2decda28
Commit Graph

122273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent JARDIN
bb0107b63d openssl_pkcs7_read: input is data not filename 
The argument should be an input string and not a filename.

Fix: https://github.com/php/doc-en/pull/559
Suggested-by: George Peter Banyard <girgias@php.net>

Closes GH-6942.
 2021-05-05 09:49:53 +02:00
Sara Golemon
f020d537b0 Reset for 8.0.7 2021-05-04 17:17:20 +00:00
Christoph M. Becker
d1c0cbdcb1 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #81011: mb_convert_encoding removes references from arrays
 2021-05-04 18:39:39 +02:00
Christoph M. Becker
0cafd53d18 Fix #81011: mb_convert_encoding removes references from arrays 
We need to dereference references.

Closes GH-6938.
 2021-05-04 18:37:40 +02:00
Nikita Popov
398cfb982e Don't treat failed assignment as initialization 
Only reset the uninitialized property flag once the type check
has succeeded. Previously the property was treated as unset rather
than uninitialized after a failed assignment.

Noticed this edge-case while working on accessors...
 2021-05-04 14:46:04 +02:00
Derick Rethans
5ce0fa2129 Merge branch 'PHP-7.4' into PHP-8.0 2021-05-04 12:18:41 +01:00
Derick Rethans
0328ff49cc Reset PHP-7.4 for 7.4.20 2021-05-04 12:18:27 +01:00
Christoph M. Becker
c2a06f5d9a Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #79100: Wrong FTP error messages
 2021-05-03 15:24:17 +02:00
Christoph M. Becker
42c72ef463 Fix #79100: Wrong FTP error messages 
First we need to properly clear the `inbuf`, what is an amendment to
commit d2881adcbc[1].

Then we need to report `php_pollfd_for_ms()` failures right away; just
setting `errno` does not really help, since at least in some cases it
would have been overwritten before we actually could check it.  We use
`php_socket_strerror()` to get a proper error message, and define
`ETIMEDOUT` to the proper value on Windows; otherwise we catch the
definition in errno.h, which is not compatible with WinSock.  The
proper solution for this issue would likely be to include something
like ext/sockets/windows_common.h.

Finally, we ensure that we only report warnings using `inbuf`, if it is
not empty.

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

Closes GH-6718.
 2021-05-03 15:19:57 +02:00
Máté Kocsis
30d3062c9b Fix the default value of $mode in PDOStatement::fetch*() 
Closes GH-6933
 2021-05-03 13:06:38 +02:00
Christoph M. Becker
645815c5b7 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #73246: XMLReader: encoding length not checked
 2021-05-03 12:29:24 +02:00
Christoph M. Becker
272df442f5 Fix #73246: XMLReader: encoding length not checked 
libxml2 expects the passed encoding to be NUL terminated, so we reject
strings with NUL bytes right away.

Closes GH-6899.
 2021-05-03 12:26:37 +02:00
Matteo Beccati
7bc9df4af2 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Revert "Fix #80892: PDO::PARAM_INT is treated the same as PDO::PARAM_STR"
 2021-04-29 12:05:49 +02:00
Matteo Beccati
b8e49fe872 Revert "Fix #80892: PDO::PARAM_INT is treated the same as PDO::PARAM_STR" 
This reverts commit 340a06778c.
 2021-04-29 11:59:16 +02:00
Nikita Popov
47bed58a53 Show used git commit in community tests 
So we know exactly which revision was tested.
 2021-04-29 11:03:48 +02:00
Nikita Popov
2ceef24f4a Remove incorrect func info for array_reduce() and pos() 
These are both clearly not rc1 functions. As they are otherwise
UNKNOWN_INFO, I'm just dropping them entirely.
 2021-04-28 11:41:21 +02:00
Nikita Popov
028dd891f9 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  filter_var_array() may return array_of_ref
 2021-04-28 11:27:55 +02:00
Nikita Popov
5acab7ebb4 filter_var_array() may return array_of_ref 
This function preserves references in the input array.
 2021-04-28 11:27:14 +02:00
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