From: Zeev Suraski <zeev@php.net>
Date: Mon, 29 May 2000 18:53:42 +0000 (+0000)
Subject: Fix bug #4678
X-Git-Tag: PRE_EIGHT_BYTE_ALLOC_PATCH~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=950fb739f8d13db868d6c5c20cf1cbb129d43880;p=php

Fix bug #4678
---

diff --git a/NEWS b/NEWS
index 3a17a7b78a..f2be22e008 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PHP 4.0                                                                    NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ?? ??? 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
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index caa6ad5850..0f2a0b4b51 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -515,7 +515,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
 		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