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 152c02e4f4bf7c4c863744c164664bacbb2d73f8..d8953afebfad6da5760ecbaf2d8cedc983537429 100644 (file)
--- 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 c9e5de1e9a7cb0a3c309e832e8960a46d581a47f..4caf1435932fd310314ab5c760af8111f88ec762 100644 (file)
--- 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) 
 {