From: Georg Richter <georg@php.net>
Date: Tue, 31 Oct 2006 15:23:16 +0000 (+0000)
Subject: Fixed function headers (added missing U)
X-Git-Tag: RELEASE_1_0_0RC1~1174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1763eaec256548b7686173a94d0e4df561d64f97;p=php

Fixed function headers (added missing U)
fixed socket parameter (was removed by mistake in a previous commit)
---

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 152c02e4f4..d8953afebf 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1084,7 +1084,7 @@ PHP_FUNCTION(mysqli_get_server_version)
 }
 /* }}} */
 
-/* {{{ proto string mysqli_info(object link)
+/* {{{ proto string mysqli_info(object link) U
    Get information about the most recent query */
 PHP_FUNCTION(mysqli_info)
 {
@@ -1631,7 +1631,7 @@ PHP_FUNCTION(mysqli_stmt_data_seek)
 }
 /* }}} */
 
-/* {{{ proto int mysqli_stmt_field_count(object stmt) { U
+/* {{{ proto int mysqli_stmt_field_count(object stmt) U
    Return the number of result columns for the given statement */
 PHP_FUNCTION(mysqli_stmt_field_count)
 {
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index c9e5de1e9a..4caf143593 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -52,6 +52,10 @@ PHP_FUNCTION(mysqli_connect)
 		return;
 	}
 
+	if (!socket_len) {
+		socket = NULL;
+	}
+
 	if (!passwd) {
 		passwd = MyG(default_pw);
 		if (!username){
@@ -157,7 +161,7 @@ PHP_FUNCTION(mysqli_fetch_assoc)
 }
 /* }}} */
 
-/* {{{ proto mixed mysqli_fetch_object (object result [, string class_name [, NULL|array ctor_params]]) 
+/* {{{ proto mixed mysqli_fetch_object (object result [, string class_name [, NULL|array ctor_params]]) U
    Fetch a result row as an object */
 PHP_FUNCTION(mysqli_fetch_object) 
 {