Merge branch 'PHP-8.4' into PHP-8.5

iliaal · iliaal · commit d82430824bd8 · 2026-06-17T06:47:15.000-04:00
* PHP-8.4:
  Remove stray printf() on invalid DSN version in pdo_dblib
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
@@ -535,7 +535,6 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
 		}
 
 		if (i==nvers) {
-			printf("Invalid version '%s'\n", vars[5].optval);
 			pdo_raise_impl_error(dbh, NULL, "HY000", "PDO_DBLIB: Invalid version specified in connection string.");
 			goto cleanup; /* unknown version specified */
 		}

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,6 @@ static int pdo_dblib_handle_factory(pdo_dbh_t dbh, zval driver_options)`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`if (i==nvers) {`
`538`		`- printf("Invalid version '%s'\n", vars[5].optval);`
`539`	`538`	`pdo_raise_impl_error(dbh, NULL, "HY000", "PDO_DBLIB: Invalid version specified in connection string.");`
`540`	`539`	`goto cleanup; /* unknown version specified */`
`541`	`540`	`}`