Skip to content

Mysqli struct upd #19072

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
merged 3 commits into from
Oct 1, 2025
Merged

Mysqli struct upd #19072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d55bfe4
ext/mysqli: global struct size reduction.
devnexen Jul 8, 2025
b9a7004
connection port ini value sanity check addition.
devnexen Jul 8, 2025
a9f29d5
add test
devnexen Jul 9, 2025
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
15 changes: 14 additions & 1 deletion ext/mysqli/mysqli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,19 @@ static const MYSQLND_REVERSE_API mysqli_reverse_api = {
mysqli_convert_zv_to_mysqlnd
};

static PHP_INI_MH(OnUpdateDefaultPort)
{
zend_long value = ZEND_ATOL(ZSTR_VAL(new_value));

if (value < 0 || value > USHRT_MAX) {
return FAILURE;
}

MyG(default_port) = (unsigned short)value;

return SUCCESS;
}

/* {{{ PHP_INI_BEGIN */
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY_EX("mysqli.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_mysqli_globals, mysqli_globals, display_link_numbers)
Expand All @@ -433,7 +446,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("mysqli.default_host", NULL, PHP_INI_ALL, OnUpdateString, default_host, zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_ENTRY("mysqli.default_user", NULL, PHP_INI_ALL, OnUpdateString, default_user, zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_ENTRY("mysqli.default_pw", NULL, PHP_INI_ALL, OnUpdateString, default_pw, zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_ENTRY("mysqli.default_port", "3306", PHP_INI_ALL, OnUpdateLong, default_port, zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_ENTRY("mysqli.default_port", "3306", PHP_INI_ALL, OnUpdateDefaultPort, default_port, zend_mysqli_globals, mysqli_globals)
#ifdef PHP_MYSQL_UNIX_SOCK_ADDR
STD_PHP_INI_ENTRY("mysqli.default_socket", MYSQL_UNIX_ADDR,PHP_INI_ALL,OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals)
#else
Expand Down
16 changes: 8 additions & 8 deletions ext/mysqli/php_mysqli_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,21 +236,21 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul


ZEND_BEGIN_MODULE_GLOBALS(mysqli)
zend_long num_links;
zend_long max_links;
zend_long num_active_persistent;
zend_long num_inactive_persistent;
zend_long max_persistent;
unsigned short default_port;
bool allow_persistent;
zend_ulong default_port;
bool allow_local_infile;
char *default_host;
char *default_user;
char *default_pw;
char *default_socket;
bool allow_local_infile;
char *local_infile_directory;
zend_long error_no;
char *error_msg;
zend_long num_links;
zend_long max_links;
zend_long num_active_persistent;
zend_long num_inactive_persistent;
zend_long max_persistent;
zend_long error_no;
zend_long report_mode;
bool rollback_on_cached_plink;
ZEND_END_MODULE_GLOBALS(mysqli)
Expand Down
21 changes: 21 additions & 0 deletions ext/mysqli/tests/mysqli_default_port_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--TEST--
default_port ini setting
--EXTENSIONS--
mysqli
--FILE--
<?php
$orig_port = ini_get("mysqli.default_port");
ini_set('mysqli.default_port', 65536);
$new_port = ini_get("mysqli.default_port");
var_dump($orig_port === $new_port);
ini_set('mysqli.default_port', -1);
$new_port = ini_get("mysqli.default_port");
var_dump($orig_port === $new_port);
ini_set('mysqli.default_port', $orig_port - 1);
$new_port = ini_get("mysqli.default_port");
var_dump($orig_port === $new_port);
?>
--EXPECT--
bool(true)
bool(true)
bool(false)