Fix persistent procedural ODBC connections not getting closed

Like oci8, procedural ODBC uses an apply function on the hash list to
enumerate persistent connections and close the specifi

Fix persistent procedural ODBC connections not getting closed

Like oci8, procedural ODBC uses an apply function on the hash list to
enumerate persistent connections and close the specific one. However,
this function take zvals, not resources. However, it was getting casted
as such, causing it to interpret the pointer incorrectly. This could
have caused other issues, but mostly manifested as failing to close the
connection even fi it matched.

The function now takes a zval and gets the resource from that. In
addition, it also removes the cast of the function pointer and moves
casting to the function body, to avoid possible confusion like this in
refactors again. It also cleans up style and uses constants in the
function body.

Closes GH-12132

Signed-off-by: George Peter Banyard <girgias@php.net>

show more ...

Fix memory leak with failed SQLPrepare

Closes GH-12095

Signed-off-by: George Peter Banyard <girgias@php.net>

Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
Fix handling of single-key connection strings

Fix handling of single-key connection strings

A connection string may contain just a single key, but
PHP used ";" as the heuristic to detect if a string was a connection
string versu

Fix handling of single-key connection strings

A connection string may contain just a single key, but
PHP used ";" as the heuristic to detect if a string was a connection
string versus plain DSN. However, a single-key connection string
would get treated like a DSN name, i.e. "DSN=*LOCAL". This makes it
so that "=" is used, as a connection string must contain a key.

Closes GH-8748.

show more ...

Fixed some spaces used instead of tabs

Update http->https in license (#6945)

1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as

Update http->https in license (#6945)

1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as 3.0 states "php 5.1.1, 4.1.1, and earlier".
3. In some license comments is "at through the world-wide-web" while most is without "at", so deleted.
4. fixed indentation in some files before |

show more ...

Merge branch 'PHP-8.0'

* PHP-8.0:
Remove incorrect format argument

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Remove incorrect format argument

Remove incorrect format argument

rc is not used by the printf format.

Merge branch 'PHP-8.0'

* PHP-8.0:
Fix #80460: ODBC doesn't account for SQL_NO_TOTAL indicator

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #80460: ODBC doesn't account for SQL_NO_TOTAL indicator

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 neg

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.

show more ...

Introduce pseudo-keyword ZEND_FALLTHROUGH

And use it instead of comments

Replace zend_bool uses with bool

We're starting to see a mix between uses of zend_bool and bool.
Replace all usages with the standard bool type everywhere.

Of course, zend_bool

Replace zend_bool uses with bool

We're starting to see a mix between uses of zend_bool and bool.
Replace all usages with the standard bool type everywhere.

Of course, zend_bool is retained as an alias.

show more ...

Fix #80592: all floats are the same in ODBC parameters

We must not release the strings until we are done with them.

Closes GH-6579.

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix format specifier

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix format specifier

Fix format specifier

In this function, `i` is of type `size_t`.

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #44618: Fetching may rely on uninitialized data

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #44618: Fetching may rely on uninitialized data

Fix #44618: Fetching may rely on uninitialized data

Unless `SQLGetData()` returns `SQL_SUCCESS` or `SQL_SUCCESS_WITH_INFO`,
the `StrLen_or_IndPtr` output argument is not guaranteed to be

Fix #44618: Fetching may rely on uninitialized data

Unless `SQLGetData()` returns `SQL_SUCCESS` or `SQL_SUCCESS_WITH_INFO`,
the `StrLen_or_IndPtr` output argument is not guaranteed to be properly
set. Thus we handle retrieval failure other than `SQL_ERROR` by
yielding `false` for those column values and raising a warning.

Closes GH-6281.

show more ...

Change parameters types from int to bool

These are typical boolean parameters, so we shouldn't advertize them as
integers. For the `$reverse` parameter that even fixes expectations,

Change parameters types from int to bool

These are typical boolean parameters, so we shouldn't advertize them as
integers. For the `$reverse` parameter that even fixes expectations,
because the `reverse` member is a bitfield of 1 bit, so assigning any
even integer would not set it.

Closes GH-6328.

show more ...

Don't separate array parameter

Closes GH-6243.

Merge branch 'PHP-7.4' into master

* PHP-7.4:
Fix #46050: odbc_next_result corrupts prepared resource

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #46050: odbc_next_result corrupts prepared resource