added MySQLI ini entries

added ini parameter for mysql->reconnect

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 4befc71e6459d8ae7690df23df036f93bf34f1de..68bbf8e228753e2069818c3c44bd18b8b171a84d 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -316,6 +316,7 @@ PHP_INI_BEGIN()
        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_socket",                      NULL,   PHP_INI_ALL,            OnUpdateStringUnempty,  default_socket, zend_mysqli_globals,            mysqli_globals)
+       STD_PHP_INI_BOOLEAN("mysqli.reconnect",                         "0",    PHP_INI_SYSTEM,         OnUpdateLong,           reconnect,                      zend_mysqli_globals,            mysqli_globals)
 PHP_INI_END()
 
 /* }}} */
@@ -331,6 +332,7 @@ static void php_mysqli_init_globals(zend_mysqli_globals *mysqli_globals)
        mysqli_globals->default_user = NULL;
        mysqli_globals->default_pw = NULL;
        mysqli_globals->default_socket = NULL;
+       mysqli_globals->reconnect = 0;
        mysqli_globals->report_mode = 0;
        mysqli_globals->report_ht = 0;
        mysqli_globals->multi_query = 0;

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 69bb79a7a53ccaacc2d15aa1e7a0c0d1a089a55c..e928171c20d0bd8942f766a199d7a5351ae8dbf0 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1272,7 +1272,7 @@ PHP_FUNCTION(mysqli_real_connect)
        }
        php_mysqli_set_error(mysql_errno(mysql), (char *)mysql_error(mysql) TSRMLS_CC);
 
-       mysql->reconnect = 0;
+       mysql->reconnect = MyG(reconnect);
        
        if (object) {
                ((mysqli_object *) zend_object_store_get_object(object TSRMLS_CC))->valid = 1;

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index e0104023127b009da12f7133e7646b924c791c75..347cee72950648f498f8de732416c0b18a83b7e0 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -83,7 +83,7 @@ PHP_FUNCTION(mysqli_connect)
        /* clear error */
        php_mysqli_set_error(mysql_errno(mysql), (char *) mysql_error(mysql) TSRMLS_CC);
 
-       mysql->reconnect = 0;
+       mysql->reconnect = MyG(reconnect);
 
        mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
        mysqli_resource->ptr = (void *)mysql;

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index f5e5dd116db6060b24ffa8e0e706c70cac84fbce..b0a33a24250fac631ed9e9c7397fa9d9bc2c37af 100644 (file)
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -362,8 +362,9 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
        unsigned int    default_port;
        char                    *default_host;
        char                    *default_user;
-       char                    *default_pw;
        char                    *default_socket;
+    char            *default_pw;
+       int                             reconnect;
        long                    error_no;
        char                    *error_msg;
        int                             report_mode;

diff --git a/php.ini-dist b/php.ini-dist
index 450013ac6fe76802a3782529626b0923cb74c122..6d62a624309481131a0ad747d89e75f1bd638187 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -681,6 +681,37 @@ mysql.connect_timeout = 60
 ; SQL-Erros will be displayed.
 mysql.trace_mode = Off
 
+[MySQLI]
+
+; Maximum number of links.  -1 means no limit.
+mysqli.max_links = -1
+
+; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
+; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
+; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
+; at MYSQL_PORT.
+mysqli.default_port = 3306
+
+; Default socket name for local MySQL connects.  If empty, uses the built-in
+; MySQL defaults.
+mysqli.default_socket =
+
+; Default host for mysql_connect() (doesn't apply in safe mode).
+mysqli.default_host =
+
+; Default user for mysql_connect() (doesn't apply in safe mode).
+mysqli.default_user =
+
+; Default password for mysqli_connect() (doesn't apply in safe mode).
+; Note that this is generally a *bad* idea to store passwords in this file.
+; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_password")
+; and reveal this password!  And of course, any users with read access to this
+; file will be able to reveal the password as well.
+mysqli.default_password =
+
+; Allow or prevent reconnect
+mysqli.reconnect = Off
+
 [mSQL]
 ; Allow or prevent persistent links.
 msql.allow_persistent = On

diff --git a/php.ini-recommended b/php.ini-recommended
index 2a73c897faab2f3b6cfbb27221e7e7520e3ddaed..089e3cfbb040182e4156c097fc380efb88d12c30 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -701,6 +701,37 @@ mysql.connect_timeout = 60
 ; SQL-Erros will be displayed.
 mysql.trace_mode = Off
 
+[MySQLI]
+
+; Maximum number of links.  -1 means no limit.
+mysqli.max_links = -1
+
+; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
+; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
+; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
+; at MYSQL_PORT.
+mysqli.default_port = 3306
+
+; Default socket name for local MySQL connects.  If empty, uses the built-in
+; MySQL defaults.
+mysqli.default_socket =
+
+; Default host for mysql_connect() (doesn't apply in safe mode).
+mysqli.default_host =
+
+; Default user for mysql_connect() (doesn't apply in safe mode).
+mysqli.default_user =
+
+; Default password for mysqli_connect() (doesn't apply in safe mode).
+; Note that this is generally a *bad* idea to store passwords in this file.
+; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_password")
+; and reveal this password!  And of course, any users with read access to this
+; file will be able to reveal the password as well.
+mysqli.default_password =
+
+; Allow or prevent reconnect
+mysqli.reconnect = Off
+
 [mSQL]
 ; Allow or prevent persistent links.
 msql.allow_persistent = On