document additional options for ssl connectiong, mainly needed by old libpq clients
authorioguix <ioguix>
Mon, 18 Feb 2008 21:42:47 +0000 (21:42 +0000)
committerioguix <ioguix>
Mon, 18 Feb 2008 21:42:47 +0000 (21:42 +0000)
classes/database/Connection.php

index 90d0f72ab8a747c894ba2ed0e90dec69b0da44e9..935e979e96cd7d4cd80eab5a4c504594dc9e8d5d 100755 (executable)
@@ -3,7 +3,7 @@
 /**
  * Class to represent a database connection
  *
- * $Id: Connection.php,v 1.14 2007/09/11 11:39:58 xzilla Exp $
+ * $Id: Connection.php,v 1.15 2008/02/18 21:42:47 ioguix Exp $
  */
 
 include_once('./classes/database/ADODB_base.php');
@@ -32,9 +32,12 @@ class Connection {
                else
                        $pghost = "{$host}:{$port}";
 
-               // Add sslmode to $pghost if set
-               if ($sslmode !== null && $sslmode != '')
-                       $pghost .= ':'.$sslmode;
+               // Add sslmode to $pghost as needed
+                if (($sslmode == 'disable') || ($sslmode == 'allow') || ($sslmode == 'prefer') || ($sslmode == 'require')) {
+                        $pghost .= ':'.$sslmode;
+                } elseif ($sslmode == 'legacy') {
+                        $pghost .= ' requiressl=1';
+                }
 
                $this->conn->connect($pghost, $user, $password, $database);
        }