php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 22:41:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
114,862 Commits 547 Branches 1,483 Tags
a1cee97de17fb124485da65bacdf8fa8d4db5b09
Commit Graph

52522 Commits

Author SHA1 Message Date
George Peter Banyard
a1cee97de1 Fixed incorrect logical conditions 2020-09-30 08:21:46 +03: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
Christoph M. Becker
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
Christoph M. Becker
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
Nikita Popov
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
Matthias Karbe
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
Matthias Karbe
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
Stanislav Malyshev
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
Stanislav Malyshev
2f5cb702ff Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV) 2020-09-28 21:43:11 -07:00
Stanislav Malyshev
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
Christoph M. Becker
f1d8395c77 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #67465: NULL Pointer dereference in odbc_handle_preparer
 2020-09-28 22:58:16 +02:00
Christoph M. Becker
6acfb79276 Fix #67465: NULL Pointer dereference in odbc_handle_preparer 
We have to initialize `stmt->driver_data` before we use it.

Closes GH-6225.
 2020-09-28 22:57:01 +02:00
Stanislav Malyshev
0216630ea2 Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV) 2020-09-26 23:46:53 -07:00
George Peter Banyard
ef385e806f Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix logic error in PDO
 2020-09-25 16:32:41 +01:00
George Peter Banyard
4dfbf07644 Fix logic error in PDO 2020-09-25 16:28:48 +01:00
Christoph M. Becker
1086e4ec88 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #80147: BINARY strings may not be properly zero-terminated
 2020-09-25 13:52:08 +02:00
Christoph M. Becker
a49555a9e1 Fix #80147: BINARY strings may not be properly zero-terminated 
We have to manually ensure that all strings fetched from a data source
are zero-terminated.

Closes GH-6213.
 2020-09-25 13:51:18 +02:00
Christoph M. Becker
54cbee526a Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Use proper skipif section
 2020-09-24 17:13:01 +02:00
Christoph M. Becker
e74f89d95a Use proper skipif section 
The ODBC tests have to be skipped if no connection to the server can be
established.
 2020-09-24 17:12:18 +02:00
Christoph M. Becker
901d022001 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78470: odbc_specialcolumns() no longer accepts $nullable
 2020-09-24 12:16:54 +02:00
Christoph M. Becker
610e7d2c77 Fix #78470: odbc_specialcolumns() no longer accepts $nullable 
It is mandatory to pass either `SQL_NO_NULLS` or `SQL_NULLABLE` as
tenth parameter to `SQLSpecialColumns()`; otherwise the function call
fails.  Therefore the user must be allowed to pass the desired value
as parameter to `odbc_specialcolumns()` again.

Closes GH-6200.
 2020-09-24 12:15:59 +02:00
Christoph M. Becker
a89ac98f15 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #76735: Incorrect message in fopen on invalid mode
 2020-09-23 10:54:59 +02:00
Christoph M. Becker
2576c57a51 Fix #76735: Incorrect message in fopen on invalid mode 
We have to log errors in `stream_opener` callbacks to the wrapper's
error log, because otherwise we may pick up an unrelated `errno` or a
most generic message.

Closes GH-6187.
 2020-09-23 10:54:06 +02:00
Christoph M. Becker
d30ec2cd85 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #77493: curl_basic_009 fails with newer curl versions
 2020-09-23 10:44:06 +02:00
Christoph M. Becker
9439d65f0d Fix #77493: curl_basic_009 fails with newer curl versions 
libcurl 7.62.0 introduced a maximum protocol length of 8, so this test
case failed with `CURLE_URL_MALFORMAT`.  While this is lifted to 40 as
of libcurl 7.65.0, and this test case has already been fixed with
commit e27301c[1], we restore the original intention to check for a
`CURLE_UNSUPPORTED_PROTOCOL ` error.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=e27301c7b37f6a1643a0dc1966919bd62a32bc74>
 2020-09-23 10:42:48 +02:00
Christoph M. Becker
ff0f6c26c2 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #76943: Inconsistent stream_wrapper_restore() errors
 2020-09-22 16:12:37 +02:00
Christoph M. Becker
5ed0602ec6 Fix #76943: Inconsistent stream_wrapper_restore() errors 
If restoring of any not registered built-in wrapper is requested, the
function is supposed to fail with a warning, so we have to check this
condition first.

Furthermore, to be able to detect whether a built-in wrapper has been
changed, it is not sufficient to check whether *any* userland wrapper
has been registered, but rather whether the specific wrapper has been
modified.

Closes GH-6183.
 2020-09-22 16:11:35 +02:00
Christoph M. Becker
d1feeed7f3 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix memory leak in php_imap_mutf7()
 2020-09-21 11:26:41 +02:00
Christoph M. Becker
730fdc77a7 Fix memory leak in php_imap_mutf7() 
We have to free the string which has been allocated by libc-client.
 2020-09-21 11:25:46 +02:00
Christoph M. Becker
d27dc5c028 Fix #80118: Erroneous whitespace match with JIT only 
We backport r1273[1] from PCRE2.

[1] <https://vcs.pcre.org/pcre2?revision=1273&view=revision>

Closes GH-6165.
 2020-09-21 10:28:22 +02:00
Christoph M. Becker
105132bd6b Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #80114: parse_url does not accept URLs with port 0
 2020-09-20 15:37:11 +02:00
Christoph M. Becker
81b2f3e5d9 Fix #80114: parse_url does not accept URLs with port 0 
URIs with a 0 port are generally valid, so `parse_url()` should
recognize such URIs, but still report the port as missing.

Co-authored-by: twosee <twose@qq.com>

Closes GH-6152.
 2020-09-20 15:34:45 +02:00
Nikita Popov
9d1c7f8b13 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix mysqli build with mysqlnd and without PDO
 2020-09-20 10:02:32 +02:00
Bob Weinand
a7544411df Fix mysqli build with mysqlnd and without PDO 2020-09-20 10:02:09 +02:00
Nikita Popov
f23164584e Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78179: mysqli/mysqlnd transaction extensions
 2020-09-18 15:30:06 +02:00
Daniel Black
740f0f6165 Fix #78179: mysqli/mysqlnd transaction extensions 
MariaDB versioning created a mess with regarding testing
features based on version. We sidestep the problem here
by assuming the extensions are present, and if a syntax
error occurs with a SQL mode TRANS_START_READ_WRITE |
TRANS_START_READ_ONLY enabled, then output the same
warning as before.
 2020-09-18 15:29:44 +02:00
Nikita Popov
e6dc9abdb7 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Support NO_BACKSLASH_ESCAPES with newer libmysqlclient
 2020-09-18 15:25:35 +02:00
Nikita Popov
70cba36fc9 Support NO_BACKSLASH_ESCAPES with newer libmysqlclient 
Requires the use of mysql_real_escape_string_quote().
 2020-09-18 15:24:57 +02:00
Nikita Popov
d87c393a18 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Use MyISAM engine for new test
 2020-09-18 14:50:02 +02:00
Nikita Popov
77f43e48ff Use MyISAM engine for new test 
Travis on 7.3 is showing this error:

> The size of BLOB/TEXT data inserted in one transaction is greater
> than 10% of redo log size. Increase the redo log size using
> innodb_log_file_size.

Force MyISAM engine to avoid this.
 2020-09-18 14:49:43 +02:00
Nikita Popov
5e7c5a82a5 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #80107: Handling of large compressed packets
  Bug #80107 Add test for mysqli_query() fails for ~16 MB long query when compression is enabled
 2020-09-18 12:57:50 +02:00
Nikita Popov
ecd9c42f9e Fix bug #80107: Handling of large compressed packets 
There's two layers of packet splitting going on. First, packets
need to be split into having a payload of exactly 2^24-1 bytes or
being the last packet. If the split packet has size between 2^24-5
and 2^24-1 bytes, the compressed packets also needs to be split,
though the choice of split doesn't matter here. I'm splitting off
the first 8192 bytes, as that's what I observe libmysqlclient to be
doing.
 2020-09-18 12:55:44 +02:00
Máté Kocsis
c7ceebc42c Bug #80107 Add test for mysqli_query() fails for ~16 MB long query when compression is enabled 2020-09-18 12:42:08 +02:00
Christoph M. Becker
f3ea88bff7 Fix bundled libpcre2 build regarding the -fcf-protection gcc flag 
Cf. <https://bugs.exim.org/show_bug.cgi?id=2578>.
 2020-09-17 16:21:01 +02:00
Nikita Popov
33069575d5 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix mysqli_release_savepoint() on mysqlnd
 2020-09-17 16:03:26 +02:00
Nikita Popov
c3944c4c4f Fix mysqli_release_savepoint() on mysqlnd 
mysqli_release_savepoint() was not actually releasing a savepoint...
 2020-09-17 15:59:09 +02:00
Christoph M. Becker
9f2d03952d Update to PCRE2 10.35 
We also backport the fix for bug #79846, and add a test case for the
related bug #79363.
 2020-09-17 14:07:05 +02:00
Christoph M. Becker
c3c76dbfb9 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #80115: mysqlnd.debug doesn't recognize absolute paths with slashes
 2020-09-17 12:38:16 +02:00