cvs: php4 / NEWS /ext/mysql/ php_mysql.c

zeev Mon May 29 11:53:42 2000 EDT Modified files: /php4 NEWS /php4/ext/mysql php_mysql.c Log: Fix bug #4678 Index: php4/NEWS diff -u php4/NEWS:1.263 php4/NEWS:1.264 --- php4/NEWS:1.263 Mon May 29 10:22:35 2000 +++ php4/NEWS Mon May 29 11:53:42 2000 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2000, Version 4.0.1 +- Fixed a bug in mysql_connect() that made it ignore the socket argument, in + case of non-persistent connects (Zeev) - Added disable_functions php.ini directive, to allow administrators to disable certain functions for security reasons (Zeev) - Fixed sessions on Win32. When setting the directory depth parameter in Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.45 php4/ext/mysql/php_mysql.c:1.46 --- php4/ext/mysql/php_mysql.c:1.45 Tue May 23 02:33:41 2000 +++ php4/ext/mysql/php_mysql.c Mon May 29 11:53:42 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.45 2000/05/23 09:33:41 sas Exp $ */ +/* $Id: php_mysql.c,v 1.46 2000/05/29 18:53:42 zeev Exp $ */ /* TODO: @@ -515,7 +515,7 @@ mysql = (MYSQL *) emalloc(sizeof(MYSQL)); #if MYSQL_VERSION_ID > 32199 /* this lets us set the port number */ mysql_init(mysql); - if (mysql_real_connect(mysql,host,user,passwd,NULL,port,NULL,0)==NULL) { + if (mysql_real_connect(mysql,host,user,passwd,NULL,port,socket,0)==NULL) { #else if (mysql_connect(mysql,host,user,passwd)==NULL) { #endif