CVS update: php31/ext/mysql
| From: | shane | Date: | Wed, 16 Sep 1998 19:15:21 +0000 |
| Subject: | CVS update: php31/ext/mysql | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1178@lists.php.net to get a copy of this message | ||
Date: Wednesday September 16, 1998 @ 15:15
Author: shane
Update of /repository/php31/ext/mysql
In directory asf:/u2/tmp/cvs-serv20230/ext/mysql
Modified Files:
mysql.c
Log Message:
fix cfg_get functions. I know they'll be changing eventualy, might as well
have it work now though.
apache works again.
Index: php31/ext/mysql/mysql.c
diff -c php31/ext/mysql/mysql.c:2.12 php31/ext/mysql/mysql.c:2.13
*** php31/ext/mysql/mysql.c:2.12 Mon Sep 14 12:56:29 1998
--- php31/ext/mysql/mysql.c Wed Sep 16 15:15:20 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: mysql.c,v 2.12 1998/09/14 16:56:29 shane Exp $ */
/* TODO:
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: mysql.c,v 2.13 1998/09/16 19:15:20 shane Exp $ */
/* TODO:
***************
*** 224,253 ****
}
#endif
! /* FIXME */
! // if
(cfg_get_long("mysql.allow_persistent",&MySQL_GLOBAL(php3_mysql_module).allow_persistent)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).allow_persistent=1;
! // }
! // if
(cfg_get_long("mysql.max_persistent",&MySQL_GLOBAL(php3_mysql_module).max_persistent)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).max_persistent=-1;
! // }
! // if
(cfg_get_long("mysql.max_links",&MySQL_GLOBAL(php3_mysql_module).max_links)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).max_links=-1;
! // }
! // if
(cfg_get_string("mysql.default_host",&MySQL_GLOBAL(php3_mysql_module).default_host)==FAILURE
! // || MySQL_GLOBAL(php3_mysql_module).default_host[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_host=NULL;
! // }
! // if
(cfg_get_string("mysql.default_user",&MySQL_GLOBAL(php3_mysql_module).default_user)==FAILURE
! // || MySQL_GLOBAL(php3_mysql_module).default_user[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_user=NULL;
! // }
! // if
(cfg_get_string("mysql.default_password",&MySQL_GLOBAL(php3_mysql_module).default_password)==FAILURE
! // || MySQL_GLOBAL(php3_mysql_module).default_password[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_password=NULL;
! // }
! // if
(cfg_get_long("mysql.default_port",&MySQL_GLOBAL(php3_mysql_module).default_port)==FAILURE
! // || MySQL_GLOBAL(php3_mysql_module).default_port==0) {
#if !(WIN32|WINNT)
struct servent *serv_ptr;
char *env;
--- 224,252 ----
}
#endif
! if
(cfg_get_long("mysql.allow_persistent",&MySQL_GLOBAL(php3_mysql_module).allow_persistent)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).allow_persistent=1;
! }
! if
(cfg_get_long("mysql.max_persistent",&MySQL_GLOBAL(php3_mysql_module).max_persistent)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).max_persistent=-1;
! }
! if
(cfg_get_long("mysql.max_links",&MySQL_GLOBAL(php3_mysql_module).max_links)==FAILURE)
{
MySQL_GLOBAL(php3_mysql_module).max_links=-1;
! }
! if
(cfg_get_string("mysql.default_host",&MySQL_GLOBAL(php3_mysql_module).default_host)==FAILURE
! || MySQL_GLOBAL(php3_mysql_module).default_host[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_host=NULL;
! }
! if
(cfg_get_string("mysql.default_user",&MySQL_GLOBAL(php3_mysql_module).default_user)==FAILURE
! || MySQL_GLOBAL(php3_mysql_module).default_user[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_user=NULL;
! }
! if
(cfg_get_string("mysql.default_password",&MySQL_GLOBAL(php3_mysql_module).default_password)==FAILURE
! || MySQL_GLOBAL(php3_mysql_module).default_password[0]==0) {
MySQL_GLOBAL(php3_mysql_module).default_password=NULL;
! }
! if
(cfg_get_long("mysql.default_port",&MySQL_GLOBAL(php3_mysql_module).default_port)==FAILURE
! || MySQL_GLOBAL(php3_mysql_module).default_port==0) {
#if !(WIN32|WINNT)
struct servent *serv_ptr;
char *env;
***************
*** 262,268 ****
#else
MySQL_GLOBAL(php3_mysql_module).default_port = MYSQL_PORT;
#endif
! // }
MySQL_GLOBAL(php3_mysql_module).num_persistent=0;
MySQL_GLOBAL(php3_mysql_module).le_result = register_list_destructors(mysql_free_result,NULL);
MySQL_GLOBAL(php3_mysql_module).le_link = register_list_destructors(_close_mysql_link,NULL);
--- 261,268 ----
#else
MySQL_GLOBAL(php3_mysql_module).default_port = MYSQL_PORT;
#endif
! }
!
MySQL_GLOBAL(php3_mysql_module).num_persistent=0;
MySQL_GLOBAL(php3_mysql_module).le_result = register_list_destructors(mysql_free_result,NULL);
MySQL_GLOBAL(php3_mysql_module).le_link = register_list_destructors(_close_mysql_link,NULL);
***************
*** 342,352 ****
char *hashed_details;
int hashed_details_length;
MYSQL *mysql;
MySQL_TLS_VARS;
! /* FIXME php3_ini isnt available in a dl on windows
! if (php3_ini.sql_safe_mode) {
if (ARG_COUNT(ht)>0) {
php3_error(E_NOTICE,"SQL safe mode in effect - ignoring host/user/password
information");
}
--- 342,353 ----
char *hashed_details;
int hashed_details_length;
MYSQL *mysql;
+ int sql_safe_mode=0;
MySQL_TLS_VARS;
! cfg_get_long("mysql.allow_persistent",&sql_safe_mode);
! if (sql_safe_mode) {
if (ARG_COUNT(ht)>0) {
php3_error(E_NOTICE,"SQL safe mode in effect - ignoring host/user/password
information");
}
***************
*** 356,362 ****
hashed_details = (char *) emalloc(hashed_details_length+1);
sprintf(hashed_details,"mysql__%s_",user);
} else {
! */ host = MySQL_GLOBAL(php3_mysql_module).default_host;
user = MySQL_GLOBAL(php3_mysql_module).default_user;
passwd = MySQL_GLOBAL(php3_mysql_module).default_password;
--- 357,363 ----
hashed_details = (char *) emalloc(hashed_details_length+1);
sprintf(hashed_details,"mysql__%s_",user);
} else {
! host = MySQL_GLOBAL(php3_mysql_module).default_host;
user = MySQL_GLOBAL(php3_mysql_module).default_user;
passwd = MySQL_GLOBAL(php3_mysql_module).default_password;
***************
*** 406,412 ****
hashed_details_length = sizeof("mysql___")-1 +
strlen(SAFE_STRING(host))+strlen(SAFE_STRING(user))+strlen(SAFE_STRING(passwd));
hashed_details = (char *) emalloc(hashed_details_length+1);
sprintf(hashed_details,"mysql_%s_%s_%s",SAFE_STRING(host), SAFE_STRING(user),
SAFE_STRING(passwd));
! /* } END FIXME */
/* FIXME this causes an access violation in windows */
--- 407,413 ----
hashed_details_length = sizeof("mysql___")-1 +
strlen(SAFE_STRING(host))+strlen(SAFE_STRING(user))+strlen(SAFE_STRING(passwd));
hashed_details = (char *) emalloc(hashed_details_length+1);
sprintf(hashed_details,"mysql_%s_%s_%s",SAFE_STRING(host), SAFE_STRING(user),
SAFE_STRING(passwd));
! }
/* FIXME this causes an access violation in windows */
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net