]> granicus.if.org Git - php/log
php
4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 15 Dec 2020 09:18:54 +0000 (10:18 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  JIT: Update invalid opcache.jit INI value message to include "tracing" and "function" values

4 years agoJIT: Update invalid opcache.jit INI value message to include "tracing" and "function...
Ayesh Karunaratne [Wed, 2 Dec 2020 21:07:47 +0000 (04:07 +0700)]
JIT: Update invalid opcache.jit INI value message to include "tracing" and "function" values

`opcache.jit` accepts `tracing` and `function` as aliases, but they were not mentioned in the start-up INI warning message.
This updates the error message to include all possible values.

Closes GH-6490.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 15 Dec 2020 09:15:52 +0000 (10:15 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  IBM i PASE doesn't support ITIMER_PROF

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Tue, 15 Dec 2020 09:15:47 +0000 (10:15 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  IBM i PASE doesn't support ITIMER_PROF

4 years agoIBM i PASE doesn't support ITIMER_PROF
Calvin Buckley [Thu, 10 Dec 2020 18:25:32 +0000 (14:25 -0400)]
IBM i PASE doesn't support ITIMER_PROF

Like Cygwin, this platform needs to use a real-time timer.

This was based on a patch by @kadler, but it didn't handle unsetting
the timer, so the timeout would continue to be active, triggering
`hard_timeout` unexpectedly. The patch is fixed to handle unsetting.

Closes GH-6503.

4 years agoAdd more tests that document late static binding
jellyNoone [Mon, 14 Dec 2020 22:03:12 +0000 (23:03 +0100)]
Add more tests that document late static binding

Closes GH-6515.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 15 Dec 2020 08:51:51 +0000 (09:51 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  JIT disabled build fix.

4 years agoJIT disabled build fix.
David Carlier [Mon, 14 Dec 2020 18:42:52 +0000 (18:42 +0000)]
JIT disabled build fix.

Closes GH-6514.

4 years agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 14 Dec 2020 22:14:31 +0000 (23:14 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Add Windows support for OCI 19

4 years agoAdd Windows support for OCI 19
Christoph M. Becker [Mon, 14 Dec 2020 21:42:54 +0000 (22:42 +0100)]
Add Windows support for OCI 19

As requested by Christopher Jones.

4 years agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 14 Dec 2020 17:28:29 +0000 (18:28 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Drop pdo_mysql_prepare_load_data.phpt

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 14 Dec 2020 17:27:53 +0000 (18:27 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Drop pdo_mysql_prepare_load_data.phpt

4 years agoDrop pdo_mysql_prepare_load_data.phpt
Christoph M. Becker [Fri, 11 Dec 2020 18:20:16 +0000 (19:20 +0100)]
Drop pdo_mysql_prepare_load_data.phpt

Like the test title and some comments in this test describe, this test
was supposed to have `::prepare()` failing because `LOAD DATA INFILE`
would not be supported as prepared statement, and then the test checks
whether follow-up queries would succeed.  However, `LOAD DATA INFILE`
is supported for prepared statements at least on Windows with mysqlnd,
so the test does no longer test what it is supposed to do.  Therefore,
we drop it.

Closes GH-6509.

4 years agoUse zmm for row_c data
Nikita Popov [Mon, 14 Dec 2020 12:42:38 +0000 (13:42 +0100)]
Use zmm for row_c data

This API already doesn't match libmysqlclient, so we may as well
use the zmm.

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Mon, 14 Dec 2020 12:29:34 +0000 (15:29 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Remove unused flag

4 years agoRemove unused flag
Dmitry Stogov [Mon, 14 Dec 2020 12:29:21 +0000 (15:29 +0300)]
Remove unused flag

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Mon, 14 Dec 2020 12:28:27 +0000 (15:28 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #80506 (Immediate SIGSEGV upon ini_set("opcache.jit_debug", 1))

4 years agoFixed bug #80506 (Immediate SIGSEGV upon ini_set("opcache.jit_debug", 1))
Dmitry Stogov [Mon, 14 Dec 2020 12:28:03 +0000 (15:28 +0300)]
Fixed bug #80506 (Immediate SIGSEGV upon ini_set("opcache.jit_debug", 1))

4 years agoFixed bug #80506 (Immediate SIGSEGV upon ini_set("opcache.jit_debug", 1))
Dmitry Stogov [Mon, 14 Dec 2020 12:26:11 +0000 (15:26 +0300)]
Fixed bug #80506 (Immediate SIGSEGV upon ini_set("opcache.jit_debug", 1))

4 years agomysqlnd_error_info_init() cannot fail
Nikita Popov [Mon, 14 Dec 2020 11:31:45 +0000 (12:31 +0100)]
mysqlnd_error_info_init() cannot fail

4 years agoRemove more OOM checks
Nikita Popov [Mon, 14 Dec 2020 11:28:26 +0000 (12:28 +0100)]
Remove more OOM checks

4 years agoRemove MYSQLND_STRING_TO_INT_CONVERSION define
Nikita Popov [Mon, 14 Dec 2020 11:03:43 +0000 (12:03 +0100)]
Remove MYSQLND_STRING_TO_INT_CONVERSION define

This has been unconditionally enabled for a long time already
(the actual conversion is behind an additional runtime flag).

4 years agoMySQLnd: Remove some unnecessary allocator failure checks
Nikita Popov [Mon, 14 Dec 2020 10:58:43 +0000 (11:58 +0100)]
MySQLnd: Remove some unnecessary allocator failure checks

emalloc/pemalloc are infallible.

4 years agoMySQLnd: Remove fail thresholds from infallible allocators
Nikita Popov [Mon, 14 Dec 2020 10:51:30 +0000 (11:51 +0100)]
MySQLnd: Remove fail thresholds from infallible allocators

emalloc() etc are infallibe by design. Having a failure threshold
for them is a violation of the API contract.

4 years agoPDO: Store/pass query_string as zend_string
Nikita Popov [Fri, 11 Dec 2020 16:13:38 +0000 (17:13 +0100)]
PDO: Store/pass query_string as zend_string

Rather than storing char* + size_t, use a zend_string*. Also
avoid various copies of the query string.

4 years agoFix compile warnings in PDO Firebird
Nikita Popov [Mon, 14 Dec 2020 09:36:36 +0000 (10:36 +0100)]
Fix compile warnings in PDO Firebird

4 years agoFix MHANDLEFUNC signature
Nikita Popov [Mon, 14 Dec 2020 09:23:28 +0000 (10:23 +0100)]
Fix MHANDLEFUNC signature

The last parameter is int, not short int.

4 years agoAllow building dblib with machine-dependent libdir
Nikita Popov [Mon, 14 Dec 2020 09:17:57 +0000 (10:17 +0100)]
Allow building dblib with machine-dependent libdir

Use the same approach as for GMP: If no explicit directory is
given, assume it must be on the default include path and libdir.
Otherwise use the provided path. It does not look like libsybdb
has support for pkg-config.

4 years agoFix signed/unsigned warnings in PDO ODBC
Nikita Popov [Mon, 14 Dec 2020 09:02:25 +0000 (10:02 +0100)]
Fix signed/unsigned warnings in PDO ODBC

Add add skipif to test.

4 years agoDisallow version_compare() $operator abbreviations
Christoph M. Becker [Sun, 13 Dec 2020 18:00:51 +0000 (19:00 +0100)]
Disallow version_compare() $operator abbreviations

`version_compare()` does a sloppy check for the `$operators` argument
which allows arbitrary abbreviations of the supported operators to be
accepted.  This is both undocumented and unexpected, and could lead to
subtle BC breaks, if the order of the comparisions will be changed.
Therefore we change to strict comparisons.

Closes GH-6510.

4 years agohash: Fix signatures in the final callback defs
Anatol Belski [Sun, 13 Dec 2020 20:17:17 +0000 (21:17 +0100)]
hash: Fix signatures in the final callback defs

Signed-off-by: Anatol Belski <ab@php.net>
4 years agoMerge branch 'PHP-8.0'
Jakub Zelenka [Sun, 13 Dec 2020 18:43:04 +0000 (18:43 +0000)]
Merge branch 'PHP-8.0'

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Jakub Zelenka [Sun, 13 Dec 2020 18:42:11 +0000 (18:42 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0

4 years agoFix bug #69625: FPM returns 200 status on request without SCRIPT_FILENAME
Jakub Zelenka [Sat, 28 Nov 2020 21:27:53 +0000 (21:27 +0000)]
Fix bug #69625: FPM returns 200 status on request without SCRIPT_FILENAME

4 years agoUPGRADING.INTERNALS: Document hash init signature changes [ci skip]
Anatol Belski [Sun, 13 Dec 2020 15:50:22 +0000 (16:50 +0100)]
UPGRADING.INTERNALS: Document hash init signature changes [ci skip]

Signed-off-by: Anatol Belski <ab@php.net>
4 years agoUPGRADING: Document algorithm specific hash options [ci skip]
Anatol Belski [Sun, 13 Dec 2020 15:36:57 +0000 (16:36 +0100)]
UPGRADING: Document algorithm specific hash options [ci skip]

Signed-off-by: Anatol Belski <ab@php.net>
4 years agohash: Support custom algo parameters
Anatol Belski [Mon, 2 Nov 2020 19:00:28 +0000 (20:00 +0100)]
hash: Support custom algo parameters

The concrete need on this change is to support passing an initial seed
to the murmur hash. Passing a custom seed is important in terms of
randomizing the hash function.

The suggested implementation adds a HashTable parameter to all the
init callbacks. Further on, an array with custom arguments is accepted
from `hash` or `hash_init` from the user land. Currently several things
like `hash_hkdf` are not touched, as they don't need passing custom
args.

Some convenience macros have been added to the SHA/MD families of
functions, so the consuming code doesn't have to be changed widely.

Another way to implement this is to add another type of the init that
would accept a HT with arguments. However, that would still require
touching all the context structs in all the algos. That would also
increase the size of those structs. As an init function is called just
once, the way of modifying the existing init callback has been seen
as more preferrable.

Closes GH-6400.

Signed-off-by: Anatol Belski <ab@php.net>
Co-Developed-by: Nikita Popov <nikita.ppv@googlemail.com>
Signed-off-by: Nikita Popov <nikita.ppv@googlemail.com>
Acked-by: Michael Wallner <mike@php.net>
Reviewed-by: Máté Kocsis <kocsismate@woohoolabs.com>
Reviewed-by: Eddie Kohler <ekohler@gmail.com>
4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 11 Dec 2020 15:47:54 +0000 (16:47 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Remove bug41347.phpt as the error cases are already tested

4 years agoRemove bug41347.phpt as the error cases are already tested
ekinhbayar [Fri, 11 Dec 2020 10:07:07 +0000 (13:07 +0300)]
Remove bug41347.phpt as the error cases are already tested

Closes GH-6506.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 11 Dec 2020 15:36:07 +0000 (16:36 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #79132

4 years agoFixed bug #79132
Nikita Popov [Fri, 11 Dec 2020 15:35:03 +0000 (16:35 +0100)]
Fixed bug #79132

Following cmb's suggestion and replacing the counter with a check
against the bound_params HT, which ensures that both cannot go
out of sync.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 11 Dec 2020 13:49:58 +0000 (14:49 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  PDO MySQL: Fix nextRowset() on libmysqlclient with native PS
  PDO MySQL: Don't skip two LOCAL_INFILE tests with libmysqlclient

4 years agoPDO MySQL: Fix nextRowset() on libmysqlclient with native PS
Nikita Popov [Fri, 11 Dec 2020 13:47:38 +0000 (14:47 +0100)]
PDO MySQL: Fix nextRowset() on libmysqlclient with native PS

The logic after next_result should match the one after execute.
This was the case for mysqlnd but not libmysqlclient, which used
the non-PS logic.

4 years agoPDO MySQL: Don't skip two LOCAL_INFILE tests with libmysqlclient
Nikita Popov [Fri, 11 Dec 2020 13:19:57 +0000 (14:19 +0100)]
PDO MySQL: Don't skip two LOCAL_INFILE tests with libmysqlclient

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 11 Dec 2020 13:12:35 +0000 (14:12 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  PDO MySQL: Unskip bug_41125.phpt

4 years agoPDO MySQL: Unskip bug_41125.phpt
Nikita Popov [Fri, 11 Dec 2020 12:03:22 +0000 (13:03 +0100)]
PDO MySQL: Unskip bug_41125.phpt

This test was always skipped (leftover debug statement?)

Contrary to the comments in the test and the test expectation,
this actually works fine.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 11 Dec 2020 11:56:10 +0000 (12:56 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #67004

4 years agoFixed bug #67004
Nikita Popov [Fri, 11 Dec 2020 11:43:19 +0000 (12:43 +0100)]
Fixed bug #67004

Repeated execute() with native PS failed to release the previous
result set on libmysqlclient.

Move freeing the result set into a common location.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 11 Dec 2020 11:21:11 +0000 (12:21 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  PDO MySQL: Use stmt_next_result with libmysqlclient as well
  PDO MySQL: Fix libmysql option test

4 years agoPDO MySQL: Use stmt_next_result with libmysqlclient as well
Nikita Popov [Fri, 11 Dec 2020 11:13:52 +0000 (12:13 +0100)]
PDO MySQL: Use stmt_next_result with libmysqlclient as well

libmysqlclient added this function in version 5.5, which happens
to be the minimum we support. If we have a prepared statement,
we should use it on both mysqlnd and libmysqlclient, even if the
handling afterwards is different.

This fixes error handling with native prepared statements.

4 years agoPDO MySQL: Fix libmysql option test
Nikita Popov [Fri, 11 Dec 2020 11:04:44 +0000 (12:04 +0100)]
PDO MySQL: Fix libmysql option test

The fact that getAttribute() fails for various libmysqlclient-only
options is a known issue, and the test was taking that into account.
However, the change of the default error mode broke the handling.
We need to handle the exceptions now.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 11 Dec 2020 10:25:56 +0000 (11:25 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #62889

4 years agoFixed bug #62889
Nikita Popov [Fri, 11 Dec 2020 10:20:33 +0000 (11:20 +0100)]
Fixed bug #62889

Our minimum libmysqlclient version requirement is high enough
that we don't need to check for MYSQL_OPT_LOCAL_INFILE support.

However, the mysql_get_option() function seems to only be available
since 5.7 (though it's really hard to find any definitie information
on when MySQL introduced certain functions or changes...) so we
need to store the value of the flag locally to make it available
through getAttribute().

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 11 Dec 2020 09:53:04 +0000 (10:53 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  PDO MySQL: Fix leak with libmysqlclient and multiple rowsets

4 years agoPDO MySQL: Fix leak with libmysqlclient and multiple rowsets
Nikita Popov [Fri, 11 Dec 2020 09:47:16 +0000 (10:47 +0100)]
PDO MySQL: Fix leak with libmysqlclient and multiple rowsets

stmt->column_count gets reset before the next_rowset handler is
invoked, so we need to fetch the value from the result set instead.

Arguably PDO should be separating the destruction of the previous
result set and the switch to the next result set more cleanly...

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 11 Dec 2020 08:53:50 +0000 (09:53 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix test cases for MariaDB

4 years agoFix test cases for MariaDB
Dharman [Thu, 10 Dec 2020 23:50:02 +0000 (23:50 +0000)]
Fix test cases for MariaDB

And remove unnecessary try-catch.

Closes GH-6505.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 10 Dec 2020 15:54:52 +0000 (16:54 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #72368

4 years agoFixed bug #72368
Nikita Popov [Thu, 10 Dec 2020 15:52:17 +0000 (16:52 +0100)]
Fixed bug #72368

Generate a param count mismatch error even if the query contains
no placeholders.

Additionally we shouldn't HANDLE errors from pdo_parse_params,
which are always reported via raise_impl_error. Doing so results
in duplicate error messages.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 10 Dec 2020 15:04:48 +0000 (16:04 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Allow drivers to omit error code

4 years agoAllow drivers to omit error code
Nikita Popov [Thu, 10 Dec 2020 15:03:22 +0000 (16:03 +0100)]
Allow drivers to omit error code

And thus generate error messages that match what PDO emulation
would generate.

This fixes the error message regression from the previous commit.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 10 Dec 2020 14:53:30 +0000 (15:53 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #79131

4 years agoFixed bug #79131
Nikita Popov [Thu, 10 Dec 2020 14:51:17 +0000 (15:51 +0100)]
Fixed bug #79131

When a driver reports an error during EVT_ALLOC (and some over EVTs),
make sure we handle it as usual, i.e. warn or throw.

This requires some adjustments in PDO PgSQL to stop manually doing
this through an impl error.

Unfortunately the PDO PgSQL error messages regress because of this,
as they now include a completely arbitrary error code. There doesn't
seem to be an ability to skip it right now.

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Thu, 10 Dec 2020 11:46:03 +0000 (14:46 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Eliminate some repeatable IS_REFERENCE checks

4 years agoEliminate some repeatable IS_REFERENCE checks
Dmitry Stogov [Thu, 10 Dec 2020 11:45:54 +0000 (14:45 +0300)]
Eliminate some repeatable IS_REFERENCE checks

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 10 Dec 2020 10:48:49 +0000 (11:48 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #79872 by improving error message

4 years agoFixed bug #79872 by improving error message
Nikita Popov [Thu, 10 Dec 2020 10:46:29 +0000 (11:46 +0100)]
Fixed bug #79872 by improving error message

The actual behavior here is correct, but the previous error
message was misleading, as neither fetchAll() nor buffered queries
would help in this situation. Instead it is necessary to consume
all rowsets, which can be done by either unsetting the statement
or calling closeCursor().

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 10 Dec 2020 10:24:27 +0000 (11:24 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #76815

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Thu, 10 Dec 2020 10:24:08 +0000 (11:24 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #76815

4 years agoFixed bug #76815
Nikita Popov [Thu, 10 Dec 2020 10:21:06 +0000 (11:21 +0100)]
Fixed bug #76815

When we receive an error while reading a result set, we should
assume that no more result sets are available. libmysqlclient
implements the same behavior.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 10 Dec 2020 09:31:43 +0000 (10:31 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #71145

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Thu, 10 Dec 2020 09:31:23 +0000 (10:31 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #71145

4 years agoFixed bug #71145
Nikita Popov [Thu, 10 Dec 2020 09:28:10 +0000 (10:28 +0100)]
Fixed bug #71145

Consume any additional result sets when running INIT_COMMAND.

4 years agoMerge branch 'PHP-8.0'
twosee [Thu, 10 Dec 2020 09:16:08 +0000 (17:16 +0800)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  EXTERN_C wrapping for GC buffer APIs

4 years agoEXTERN_C wrapping for GC buffer APIs
twosee [Thu, 10 Dec 2020 06:40:41 +0000 (14:40 +0800)]
EXTERN_C wrapping for GC buffer APIs

Closes GH-6502.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 10 Dec 2020 09:05:48 +0000 (10:05 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Backport fix for bug #70066

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Thu, 10 Dec 2020 09:05:38 +0000 (10:05 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Backport fix for bug #70066

4 years agoBackport fix for bug #70066
Nikita Popov [Wed, 9 Dec 2020 16:24:30 +0000 (17:24 +0100)]
Backport fix for bug #70066

Given the number of duplicates this bug report had, it seems
worthwhile to fix this on PHP-7.4 as well.

Cherry-pick of 106e7e4bca7c0fd975eb219b18e3c34957ba8657.

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Wed, 9 Dec 2020 19:25:04 +0000 (22:25 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Perform early guard type check for result of FETCH_CONSTANT

4 years agoPerform early guard type check for result of FETCH_CONSTANT
Dmitry Stogov [Wed, 9 Dec 2020 19:24:03 +0000 (22:24 +0300)]
Perform early guard type check for result of FETCH_CONSTANT

4 years agoFix typo 'variabled' in named_params/undef_var.phpt
hgsgtk [Wed, 9 Dec 2020 10:34:04 +0000 (19:34 +0900)]
Fix typo 'variabled' in named_params/undef_var.phpt

Closes GH-6499.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Wed, 9 Dec 2020 16:25:18 +0000 (17:25 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #70066

4 years agoFixed bug #70066
Nikita Popov [Wed, 9 Dec 2020 16:24:30 +0000 (17:24 +0100)]
Fixed bug #70066

If we fall back to emulated prepared statements, destroy S->stmt,
so the code doesn't get confused about which mode we're in.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Wed, 9 Dec 2020 15:38:35 +0000 (16:38 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #66878

4 years agoFixed bug #66878
Nikita Popov [Wed, 9 Dec 2020 15:30:01 +0000 (16:30 +0100)]
Fixed bug #66878

Keep track of whether we have fully consumed all result sets,
either using nextRowset() calls or closeCursor() and skip the
attempt to consume remaining results sets during destruction in
that case.

Especiall if closeCursor() has been used, we really shouldn't
have this sort of cross-statement inference.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Wed, 9 Dec 2020 15:19:58 +0000 (16:19 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Remove unnecessary more_results() checks
  Add ifdef for mysqlnd only function

4 years agoRemove unnecessary more_results() checks
Nikita Popov [Wed, 9 Dec 2020 15:02:49 +0000 (16:02 +0100)]
Remove unnecessary more_results() checks

Just calling next_result() is sufficient.

4 years agoAdd ifdef for mysqlnd only function
Nikita Popov [Wed, 9 Dec 2020 15:03:52 +0000 (16:03 +0100)]
Add ifdef for mysqlnd only function

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Wed, 9 Dec 2020 14:29:03 +0000 (15:29 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  PDO MySQL: Extract common code for handling PS results
  PDO MySQL: Use set_row_count() helper

4 years agoPDO MySQL: Extract common code for handling PS results
Nikita Popov [Wed, 9 Dec 2020 14:28:16 +0000 (15:28 +0100)]
PDO MySQL: Extract common code for handling PS results

4 years agoPDO MySQL: Use set_row_count() helper
Nikita Popov [Wed, 9 Dec 2020 14:20:47 +0000 (15:20 +0100)]
PDO MySQL: Use set_row_count() helper

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Wed, 9 Dec 2020 14:17:25 +0000 (17:17 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed IS_32BIT/IS_SIGNED_32BIT mess

4 years agoFixed IS_32BIT/IS_SIGNED_32BIT mess
Dmitry Stogov [Wed, 9 Dec 2020 14:16:54 +0000 (17:16 +0300)]
Fixed IS_32BIT/IS_SIGNED_32BIT mess

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Wed, 9 Dec 2020 13:51:11 +0000 (14:51 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  PDO MySQL: Make sure nextRowset() works with partially consumed result

4 years agoPDO MySQL: Make sure nextRowset() works with partially consumed result
Nikita Popov [Wed, 9 Dec 2020 13:46:49 +0000 (14:46 +0100)]
PDO MySQL: Make sure nextRowset() works with partially consumed result

This was already working in all cases apart from native prepared
statements with unbuffered queries. In that case invoking
stmt_free_result() addresses the issue.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Wed, 9 Dec 2020 13:05:54 +0000 (14:05 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  PDO MySQL: Handle error during closeCursor()

4 years agoPDO MySQL: Handle error during closeCursor()
Nikita Popov [Wed, 9 Dec 2020 13:04:30 +0000 (14:04 +0100)]
PDO MySQL: Handle error during closeCursor()

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Wed, 9 Dec 2020 11:47:48 +0000 (12:47 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #78154

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Wed, 9 Dec 2020 11:47:23 +0000 (12:47 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #78154

4 years agoFixed bug #78154
Nikita Popov [Wed, 9 Dec 2020 11:46:47 +0000 (12:46 +0100)]
Fixed bug #78154

Handle errors during next_result in exec.