clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
114,473 Commits 491 Branches 1,363 Tags 839 MiB
72b3987c2d
Commit Graph

1725 Commits

Author SHA1 Message Date
Nikita Popov
f684553c2c Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix MySQL local infile / attr handling on big endian systems
 2020-04-16 11:22:43 +02:00
guirish
a1c1736bfb Fix MySQL local infile / attr handling on big endian systems 
Make sure pointer types match what is used by libmysql everywhere.

Closes GH-5380.
 2020-04-16 11:22:17 +02:00
Nikita Popov
5317ea6d57 Make mysqli_poll test more deterministic 
Handle errors appearing in different order.
 2020-04-08 16:36:22 +02:00
Christoph M. Becker
efbc962c92 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix test for Windows
 2020-03-23 16:23:33 +01:00
Christoph M. Becker
ba404f21e4 Fix test for Windows 
Windows filenames may very well contain a colon, so we adjust the test
accordingly.
 2020-03-23 16:22:45 +01:00
Christoph M. Becker
fea2994ff8 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Enclose INI values containing {TMP} in quotes
 2020-03-09 22:51:11 +01:00
Christoph M. Becker
d5e206620b Enclose INI values containing {TMP} in quotes 
At least on Windows, the temporary directory may contain tilde signs,
which would result in an INI parse error.
 2020-03-09 22:49:08 +01:00
Christoph M. Becker
78e04759ad Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #64032: mysqli reports different client_version
 2020-02-27 09:39:13 +01:00
Christoph M. Becker
8654c32b58 Fix #64032: mysqli reports different client_version 
While `mysqli_get_client_version()` calls `mysql_get_client_version()`
to retrieve the client version, `mysql::$client_version` is initialized
to `MYSQL_VERSION_ID`.  Both should match though, and since the former
is the more useful information, we fix `mysql::$client_version`.

We do not add a regression test, because it would usually succeed
anyway, and we already have several tests with respective `assert()`s.
 2020-02-27 09:35:04 +01:00
Máté Kocsis
d39edebbce
Fix #78666 mysqli_options generates Warning on var_dump() 
Closes GH-5121
 2020-01-28 18:44:02 +01:00
Nikita Popov
8a5bc8c6be Fix mysqli_get_warnings() with multi queries 
In this case warning_count may be non-zero, but php_get_warnings()
may still return no warnings. In this case we should return false
rather than returning a corrupted mysqli_warning object.
 2020-01-28 17:13:43 +01:00
Nikita Popov
c14df824d1 Fix mysqli ssl test for tls1.3 
Specifying AES256-SHA results in TLS_AES_256_GCM_SHA384 if the
connection uses TLS v1.3.
 2020-01-24 15:14:52 +01:00
Nikita Popov
b6506ab32a Increase timeout in mysqli_reap_async_query test 
The 2000 here is 2ms, which is a bit optimistic for parallelized
testing.
 2020-01-20 09:53:54 +01:00
Christoph M. Becker
b0cdd8cc53 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79084: mysqlnd may fetch wrong column indexes with MYSQLI_BOTH
 2020-01-13 13:23:12 +01:00
Christoph M. Becker
1752393bb4 Fix #79084: mysqlnd may fetch wrong column indexes with MYSQLI_BOTH 
Column names can be numeric strings, so we have to make sure to insert
the column values with the appropriate numeric keys, instead of adding
them.
 2020-01-13 13:21:45 +01:00
Christoph M. Becker
0ab53f1636 Bring back test case support for older MySQL versions 
These test cases have recently been adjusted to work with MySQL 8[1],
but some older, but still supported database versions, such as MySQL
5.6, still need the password to be sent hashed, so we fall back to
using `PASSWORD()`, if the `SET PASSWORD` query fails without it.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=b0efd18f7844da29931737b8a1cf461c7493e168>.
 2020-01-11 11:21:26 +01:00
Christoph M. Becker
f6dea34831 Fix test cases which fail on Windows debug builds 
We use the portable {TMP} instead of the hard-coded /tmp, and skip
mysqli_debug_append.phpt on Windows, because unlinking the trace file
while the connection is still open won't work there.

(cherry picked from commit 60081ca20d)
 2020-01-10 20:00:31 +01:00
Nikita Popov
b0efd18f78 Don't use PASSWORD() function in test 
Doesn't exist anymore in MySQL 8.
 2019-12-27 17:26:15 +01:00
Nikita Popov
23d4659635 Skip bug77956.phpt if local_infile disabled on server 2019-12-27 17:25:53 +01:00
Nikita Popov
6572d9149d Don't check TIMESTAMP NOT NULL in fetch_field_flags test 
The behavior of this is very dependent on the MySQL vendor, MySQL
version and MySQL configuration, in particular the
explicit_defaults_for_timestamp variable.

I don't think it's worthwhile to try and model this exactly, so
drop the test.
 2019-12-27 17:25:23 +01:00
Nikita Popov
c4cbdfa99c Don't test the RENAME DATABASE query 
Apparently this only existed for a short time, because it was
found to be insecure. Don't try to test it.
 2019-12-27 17:25:12 +01:00
Nikita Popov
f97806726f Make GeomFromText tests compatible with MySQL 8 
The function has been renamed to ST_GeomFromText.
 2019-12-27 17:25:01 +01:00
Nikita Popov
6b7cb4a8d7 Fix mysqli ssl tests 
First, make sure the tests are skipped if we connect via unix
socket, as we can't use SSL in that case.

Second, use a cipher that is not blacklisted in current MySQL
versions.
 2019-12-05 08:38:40 +01:00
Christoph M. Becker
60081ca20d Fix test cases which fail on Windows debug builds 
We use the portable {TMP} instead of the hard-coded /tmp, and skip
mysqli_debug_append.phpt on Windows, because unlinking the trace file
while the connection is still open won't work there.
 2019-11-11 12:14:38 +01:00
Nikita Popov
f085bddb51 Fix number of required arguments in arginfo 
* pack() only requires one argument
* stream_context_set_option() only requires two arguments
* ReflectionMethod::getClosure() accepts no args for static methods
* DOMDocument::createProcessingInstruction() only requires one arg
* DOMImplementation::createDocument() only requires two arguments
* DOMDocument::importNode() only requires one arg
* mysql_get_client_version() doesn't accept any args,
  despite what the docs say...
 2019-10-07 16:32:11 +02:00
Joe Watkins
5a8e7b95a1
Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
 2019-10-03 07:13:15 +02:00
Joe Watkins
f4d078b1c7
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
 2019-10-03 06:57:05 +02:00
Fábio Souto
9a2b42a5c1
Fix bug #76809 (SSL settings aren't respected when persistent connection is reused) 2019-10-03 06:56:21 +02:00
Dmitry Stogov
3709c03cda Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed test that "fails" from time to time
 2019-10-02 00:57:26 +03:00
Dmitry Stogov
f7596d1b5b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed test that "fails" from time to time
 2019-10-02 00:57:16 +03:00
Dmitry Stogov
3124129ca8 Fixed test that "fails" from time to time 2019-10-02 00:54:59 +03:00
Dmitry Stogov
5fb2f15824 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed test that "fails" from time to time
 2019-10-02 00:49:37 +03:00
Dmitry Stogov
848bc776ea Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed test that "fails" from time to time
 2019-10-02 00:49:27 +03:00
Dmitry Stogov
2fcb5eadbb Fixed test that "fails" from time to time 2019-10-02 00:48:42 +03:00
Fabien Villepinte
0aa3acc6c4 Fix borked SKIPIFs 2019-09-30 17:51:41 +02:00
Christoph M. Becker
d90711138b Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix SKIPIF in ext/mysqli
 2019-09-27 16:04:35 +02:00
Christoph M. Becker
66c48e8694 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix SKIPIF in ext/mysqli
 2019-09-27 16:04:00 +02:00
Fabien Villepinte
37d27e666a Fix SKIPIF in ext/mysqli 2019-09-27 16:03:20 +02:00
George Peter Banyard
e895e96286 Drop E_STRICT notice in mysqli extension 2019-08-31 23:14:10 +02:00
Fabien Villepinte
e1afd9b213 Modernize some connectors in tests to remove env key duplication 2019-08-30 10:33:01 +02:00
Christoph M. Becker
a18f53ec2c Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  fix the problem for connect_attr, set db condition, and add a new attribute _server_host
 2019-08-20 13:35:17 +02:00
Christoph M. Becker
3771d66142 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix the problem for connect_attr, set db condition, and add a new attribute _server_host
 2019-08-20 13:33:45 +02:00
Qianqian Bu
cdf16c010a fix the problem for connect_attr, set db condition, and add a new attribute _server_host 2019-08-20 13:31:58 +02:00
Christoph M. Becker
053df4ac3b Fix tests 
Apparently, nobody is testing with MySQL < 5.6 for quite a while.  We
should consider dropping support for these very old versions.
 2019-07-30 16:32:49 +02:00
George Peter Banyard
1a031a242c Renamed MySQLi test to remove duplicate 'mysqli_' 
Closes GH-4441
 2019-07-21 01:10:31 +02:00
George Peter Banyard
548d1ec27c Small typo and proto name fix 
Closes GH-4415
 2019-07-15 18:15:17 +02:00
Christoph M. Becker
a6fa097ceb No more need to cater to pre-PHP-5.3 or PHP-6 versions 2019-07-12 18:55:34 +02:00
Nikita Popov
852e35317d Additional fix for mysqli_fork test 2019-07-10 12:42:17 +02:00
Nikita Popov
a63422029e Fix invalid array access in mysqli_fork test 2019-07-10 11:59:27 +02:00
Pieter Hordijk
6ab04a6eef
Removed mysqlnd stats from phpinfo page 
All information can already be retrieved using the APIs at https://www.php.net/manual/en/mysqlnd.stats.php. Closes https://bugs.php.net/bug.php?id=60594
 2019-07-03 08:20:54 +02:00