mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-24 20:53:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
116,112 Commits 505 Branches 1,391 Tags 837 MiB
c6cdfa967c
Commit Graph

770 Commits

Author SHA1 Message Date
Christoph M. Becker
2ff42076ff Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #78623: Regression caused by "SP call yields additional empty result set"
 2019-10-07 09:19:08 +02:00
Christoph M. Becker
b142e8a4b3 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78623: Regression caused by "SP call yields additional empty result set"
 2019-10-07 09:18:46 +02:00
Christoph M. Becker
3322c78a88 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78623: Regression caused by "SP call yields additional empty result set"
 2019-10-07 09:17:29 +02:00
Christoph M. Becker
114c03b9a6 Fix #78623: Regression caused by "SP call yields additional empty result set" 
This reverts commit 41a4379cb4.
 2019-10-07 09:15:51 +02:00
Nikita Popov
2f92957fd3 Convert some notices to warnings 
Part of https://wiki.php.net/rfc/engine_warnings.
 2019-10-02 10:34:08 +02:00
Nikita Popov
235983dfde Merge branch 'PHP-7.4' 2019-09-30 17:52:39 +02:00
Fabien Villepinte
0aa3acc6c4 Fix borked SKIPIFs 2019-09-30 17:51:41 +02:00
Gabriel Caruso
5d6e923d46
Remove mention of PHP major version in Copyright headers 
Closes GH-4732.
 2019-09-25 14:51:43 +02:00
Nikita Popov
7b0eb5b9be Merge branch 'PHP-7.4' 2019-09-09 10:11:54 +02:00
Nikita Popov
645b0372e3 Fix double free of DSN credentials 2019-09-09 10:10:41 +02:00
Christoph M. Becker
714561d0ee Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #41997: SP call yields additional empty result set
 2019-09-03 13:33:52 +02:00
Christoph M. Becker
fd7309d194 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #41997: SP call yields additional empty result set
 2019-09-03 13:33:15 +02:00
Christoph M. Becker
b90cd91eba Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #41997: SP call yields additional empty result set
 2019-09-03 13:31:24 +02:00
Christoph M. Becker
41a4379cb4 Fix #41997: SP call yields additional empty result set 
When stored procedures are called, the "final result set is a status
result that includes no result set".  Calling `::nextRowset()` on the
actual last result set should return FALSE, since there is actually no
further result set to be processed.
 2019-09-03 13:29:30 +02:00
Christoph M. Becker
64c577abc5 Merge branch 'PHP-7.4' 
* PHP-7.4:
  fix the problem for connect_attr, set db condition, and add a new attribute _server_host
 2019-08-20 13:35:53 +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
Nikita Popov
d37d418927 Merge branch 'PHP-7.4' 2019-07-23 11:28:10 +02:00
George Peter Banyard
6d6d954d0d Cleanup of remaining E_STRICT in tests 2019-07-23 11:27:23 +02:00
Peter Kokot
567b602bcf Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove PHP_MYSQL variable
 2019-07-14 13:49:18 +02:00
Peter Kokot
7a6d737de7 Remove PHP_MYSQL variable 
PHP_MYSQL variable was once defined by the ext/mysql (--with-mysql).

Closes GH-4399
 2019-07-14 13:48:44 +02:00
Peter Kokot
4f5c6bc15e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Simplify PHP_CHECK_PDO_INCLUDES calls
 2019-07-08 10:26:08 +02:00
Peter Kokot
a39ea91753 Simplify PHP_CHECK_PDO_INCLUDES calls 
Conditional checks were once used for backwards compatibility with
phpize from PHP versions that didn't have this macro call yet.

Closes GH-4376
 2019-07-08 10:24:41 +02:00
Nikita Popov
cef59ad77b Merge branch 'PHP-7.4' 2019-07-02 12:10:32 +02:00
Sjon Hortensius
a7881df281 PDO: support username & password specified in DSN 2019-07-02 12:09:38 +02:00
Nikita Popov
9faf10bbe9 Merge branch 'PHP-7.4' 2019-06-07 10:58:06 +02:00
Nikita Popov
d831f10724 Merge branch 'PHP-7.3' into PHP-7.4 2019-06-07 10:57:51 +02:00
Nikita Popov
9569a0b8ca Merge branch 'PHP-7.2' into PHP-7.3 2019-06-07 10:57:43 +02:00
Nikita Popov
d7c7522be9 Enable STRICT_TRANS_TABLES in new test 
The part testing error cases relies on this.
 2019-06-07 10:57:09 +02:00
Nikita Popov
98de4207d8 Merge branch 'PHP-7.4' 2019-06-07 09:49:22 +02:00
Nikita Popov
1c4e93e8bd Merge branch 'PHP-7.3' into PHP-7.4 2019-06-07 09:49:09 +02:00
Nikita Popov
a5f98139c9 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-07 09:49:01 +02:00
Cameron Porter
7d1aa7534d Fixed bug #38546 
Properly support binding boolean parameters with emulated prepared
statements disabled. Also add the necessary mysqlnd support for
MYSQL_TYPE_TINY.
 2019-06-07 09:48:43 +02:00
Peter Kokot
87cfcb0b7c Merge branch 'PHP-7.4' 
* PHP-7.4:
  [ci skip] Migrate tests READMEs to Markdown
 2019-05-12 22:03:35 +02:00
Peter Kokot
83e565e244 [ci skip] Migrate tests READMEs to Markdown 2019-05-12 22:03:10 +02:00
Peter Kokot
2cf90bb2f0 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Normalize comments in *nix build system m4 files
 2019-05-12 18:51:50 +02:00
Peter Kokot
75fb74860d Normalize comments in *nix build system m4 files 
Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
  favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now
 2019-05-12 18:43:03 +02:00
Nikita Popov
fd2db11929 Always generate fatal error for LSP failures 
RFC: https://wiki.php.net/rfc/lsp_errors
 2019-05-07 13:45:28 +02:00
Christoph M. Becker
9bb6e0bffc Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix tests
 2019-04-29 09:07:45 +02:00
Christoph M. Becker
9481cb43b3 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix tests
 2019-04-29 09:07:13 +02:00
Christoph M. Becker
7faaf5a89a Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix tests
 2019-04-29 09:05:04 +02:00
Christoph M. Becker
9bf11045db Fix tests 
These tests are obviously meant to test successful and failing uri:
DSNs, but did not pass proper file:// URIs, so actually ended up
testing for invalid data source URIs twice.  We fix this, and adjust
the expectations accordingly.

We also unfork the -win32 variant, since both test cases are almost
identical, and the expected error message may be either one.
 2019-04-29 09:04:33 +02:00
Christoph M. Becker
ba90675f82 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Make MySQLPDOTest::extractVersion() more liberal
 2019-04-28 23:51:15 +02:00
Christoph M. Becker
8446554fed Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Make MySQLPDOTest::extractVersion() more liberal
 2019-04-28 23:50:43 +02:00
Christoph M. Becker
06b130579e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Make MySQLPDOTest::extractVersion() more liberal
 2019-04-28 23:49:19 +02:00
Christoph M. Becker
fc9cdb723b Make MySQLPDOTest::extractVersion() more liberal 
MySQL/MariaDB version strings may have suffixes which may contain dots;
for instance, Debian stretch has 5.5.5-10.1.37-MariaDB-0+deb9u1 or
such.  Therefore, we make the version extraction more liberal, and only
require that there are at least three parts separated by dot, and
ignore additional parts.

We also fix an erroneous test expectation, which would be triggered on
CI now, right away.  This patch has been provided by petk@.
 2019-04-28 23:48:27 +02:00
Christoph M. Becker
9396535033 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #77944: Wrong meta pdo_type for bigint on LLP64
 2019-04-27 18:48:39 +02:00
Christoph M. Becker
3464929d64 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #77944: Wrong meta pdo_type for bigint on LLP64
 2019-04-27 18:48:09 +02:00
Christoph M. Becker
e561d4100b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77944: Wrong meta pdo_type for bigint on LLP64
 2019-04-27 18:47:32 +02:00