Changeset 1201

Timestamp:

03/03/2008 11:40:26 PM (19 years ago)

Author:

sambauers

Message:

Allow socket connections under MySQLi. Fixes #762. Props livibetter

File:

• trunk/bb-includes/db-mysqli.php (modified) (3 diffs)

trunk/bb-includes/db-mysqli.php

@@ -34 +34 @@
                         $server->pass =     constant('USER_BBDB_PASSWORD');
                         $server->host =     constant('USER_BBDB_HOST');
+                        $server->port =     null;
+                        $server->socket =   null;
                         $server->charset =  $this->user_charset;
                 } else { // just us
@@ -41 +43 @@
                         $server->pass =     defined('BBDB_PASSWORD') ? constant('BBDB_PASSWORD') : false;
                         $server->host =     defined('BBDB_HOST')     ? constant('BBDB_HOST')     : false;
+                        $server->port =     null;
+                        $server->socket =   null;
                         $server->charset =  $this->charset;
                 }
                 
                 // Set the port if it is specified in the host
-                if (strpos($server->host, ':') === false) {
-                        $server->port = null;
-                } else {
+                if (strpos($server->host, ':') !== false) {
                         list($server->host, $server->port) = explode(':', $server->host);
+                        // Make it a socket if it's not numeric
+                        if (!is_numeric($server->port)) {
+                                $server->socket = $server->port;
+                                $server->port = null;
+                        }
                 }
                 
@@ -58 +65 @@
                 $this->timer_start();
                 
-                $this->$dbhname = @mysqli_connect( $server->host, $server->user, $server->pass, null, $server->port );
+                $this->$dbhname = @mysqli_connect( $server->host, $server->user, $server->pass, null, $server->port, $server->socket );
                 
                 if (!$this->$dbhname)