Skip to content

[pull] master from php:master #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 5 commits into from
Jun 30, 2026
Merged

[pull] master from php:master #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8d90e7
Fix GH-20726: crash in pdo_odbc with pooling and no credentials (#22512)
iliaal Jun 30, 2026
92c179e
Merge branch 'PHP-8.4' into PHP-8.5
iliaal Jun 30, 2026
c0872ea
Merge branch 'PHP-8.5'
iliaal Jun 30, 2026
004701d
[ci skip] Update NEWS for 8.6.0alpha2
mbeccati Jun 30, 2026
2f3a1ec
[skip ci] docs/release-process.md: Update a link to php 8.6 release s…
LamentXU123 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.6.0alpha1
?? ??? ????, PHP 8.6.0alpha2


02 Jul 2026, PHP 8.6.0alpha1

- Core:
. Added first-class callable cache to share instances for the duration of the
Expand Down
1 change: 1 addition & 0 deletions docs/release-process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ repository available according to the release schedule.
The release schedule for each version is published on the
[PHP wiki](https://wiki.php.net):

- [PHP 8.6](https://wiki.php.net/todo/php86)
- [PHP 8.5](https://wiki.php.net/todo/php85)
- [PHP 8.4](https://wiki.php.net/todo/php84)
- [PHP 8.3](https://wiki.php.net/todo/php83)
Expand Down
6 changes: 5 additions & 1 deletion ext/pdo_odbc/odbc_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,11 @@ static int pdo_odbc_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{
dsnbuf, sizeof(dsnbuf)-1, &dsnbuflen, SQL_DRIVER_NOPROMPT);
}
if (!use_direct) {
rc = SQLConnect(H->dbc, (SQLCHAR *) dbh->data_source, SQL_NTS, (SQLCHAR *) dbh->username, SQL_NTS, (SQLCHAR *) dbh->password, SQL_NTS);
/* unixODBC pooling strcmp()s the credentials when matching a cached
* connection and crashes on a NULL username/password, so pass "". */
rc = SQLConnect(H->dbc, (SQLCHAR *) dbh->data_source, SQL_NTS,
(SQLCHAR *) (dbh->username ? dbh->username : ""), SQL_NTS,
(SQLCHAR *) (dbh->password ? dbh->password : ""), SQL_NTS);
}

if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
Expand Down