georg Thu Feb 26 06:40:36 2004 EDT
Modified files:
/php-src php.ini-dist php.ini-recommended
/php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c
php_mysqli.h
Log:
added MySQLI ini entries
added ini parameter for mysql->reconnect
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.207&r2=1.208&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.207 php-src/php.ini-dist:1.208
--- php-src/php.ini-dist:1.207 Wed Feb 25 05:58:05 2004
+++ php-src/php.ini-dist Thu Feb 26 06:40:34 2004
@@ -681,6 +681,37 @@
; 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
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.152&r2=1.153&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.152 php-src/php.ini-recommended:1.153
--- php-src/php.ini-recommended:1.152 Wed Feb 25 05:58:05 2004
+++ php-src/php.ini-recommended Thu Feb 26 06:40:34 2004
@@ -701,6 +701,37 @@
; 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
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.32&r2=1.33&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.32 php-src/ext/mysqli/mysqli.c:1.33
--- php-src/ext/mysqli/mysqli.c:1.32 Sun Feb 15 07:58:18 2004
+++ php-src/ext/mysqli/mysqli.c Thu Feb 26 06:40:35 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.32 2004/02/15 12:58:18 zeev Exp $
+ $Id: mysqli.c,v 1.33 2004/02/26 11:40:35 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -316,6 +316,7 @@
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 @@
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;
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.75&r2=1.76&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.75 php-src/ext/mysqli/mysqli_api.c:1.76
--- php-src/ext/mysqli/mysqli_api.c:1.75 Thu Feb 26 03:27:24 2004
+++ php-src/ext/mysqli/mysqli_api.c Thu Feb 26 06:40:35 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.75 2004/02/26 08:27:24 georg Exp $
+ $Id: mysqli_api.c,v 1.76 2004/02/26 11:40:35 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1272,7 +1272,7 @@
}
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;
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.32&r2=1.33&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.32 php-src/ext/mysqli/mysqli_nonapi.c:1.33
--- php-src/ext/mysqli/mysqli_nonapi.c:1.32 Wed Feb 25 15:16:22 2004
+++ php-src/ext/mysqli/mysqli_nonapi.c Thu Feb 26 06:40:35 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.32 2004/02/25 20:16:22 abies Exp $
+ $Id: mysqli_nonapi.c,v 1.33 2004/02/26 11:40:35 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -83,7 +83,7 @@
/* 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;
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.30&r2=1.31&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.30 php-src/ext/mysqli/php_mysqli.h:1.31
--- php-src/ext/mysqli/php_mysqli.h:1.30 Wed Jan 28 17:51:54 2004
+++ php-src/ext/mysqli/php_mysqli.h Thu Feb 26 06:40:35 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.30 2004/01/28 22:51:54 georg Exp $
+ $Id: php_mysqli.h,v 1.31 2004/02/26 11:40:35 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -362,8 +362,9 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
