-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello Savane'rs ;-)

Due to it's instability, I've removed my persistent MySQL patch from Savane 
HEAD.  It will not be available again until I've reworked it, hopefully soon, 
and once I've tested it out thoroughly.

It's advised to update at least frontend/php/include/database.php to the 
latest HEAD revision, as apache/mysqld can crash/hang, when enabled.  
Attached is a patch you can use to revert (the file you'll need to patch is 
in frontend/php/include/database.php) if you don't/can't update via CVS.

Wbr,
Elfyn

- --
Elfyn McBratney
beu on irc.freenode.net/savannah.[non]gnu.org

PGP Key ID: 0x456548B4
PGP Key Fingerprint:
  29D5 91BB 8748 7CC9 650F 31FE 6888 0C2A 4565 48B4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFBUdekaIgMKkVlSLQRAmxXAJ9d/MyE1v06H0amcijv70c+Smg49QCfVqyK
18Q8wjvfwqAIUJPIH4o+9Kk=
=mEl1
-----END PGP SIGNATURE-----
Index: database.php
===================================================================
RCS file: /cvs/savane/savane/frontend/php/include/database.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- database.php	22 Sep 2004 08:11:51 -0000	1.11
+++ database.php	22 Sep 2004 19:28:19 -0000	1.12
@@ -2,7 +2,7 @@
 # This file is part of the Savane project
 # <http://gna.org/projects/savane/>
 #
-# $Id: database.php,v 1.11 2004/09/22 08:11:51 yeupou Exp $
+# $Id: database.php,v 1.12 2004/09/22 19:28:19 beu Exp $
 #  Copyright 1999-2000 (c) The SourceForge Crew
 #            2004      (c) Elfyn McBratney <elfyn--at--emcb.co.uk>
 #
@@ -24,17 +24,9 @@ function db_connect() 
 {
   global $sys_dbhost,$sys_dbuser,$sys_dbpasswd,$conn;
 
-  # If persistant MySQL links are enabled, try and open a
-  # persistant link.
-  $mysql_persistant_links = ini_get('mysql.allow_persistent');
-  if (strtolower($mysql_persistant_links) == 'on' || $mysql_persistant_links == '1' ) {
-    $conn = mysql_pconnect($sys_dbhost,$sys_dbuser,$sys_dbpasswd);
-  }
-
-  # If $conn is not a valid resource, try and open a normal
-  #x (non persistant) link.
-  if (!is_resource($conn)) {
-    $conn = mysql_connect($sys_dbhost,$sys_dbuser,$sys_dbpasswd);
+  $conn = mysql_connect($sys_dbhost,$sys_dbuser,$sys_dbpasswd);
+  if (!$conn) {
+    die("Failed to connect to database.  Please contact server administratots.");
   }
 }
 

Reply via email to