X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=ctdlphp%2Fctdlsession.php;h=c9614c753ef57d2b24ee068d67e2d4eed051f4ca;hb=fa2dd842abb5feedea3e2253255722fcaecc3c6f;hp=672d6f636aa7f23fabd87f2d0ef5054072a79461;hpb=0cc5b6dfb371e675478f709e340ef6a4bf42e62e;p=citadel.git

diff --git a/ctdlphp/ctdlsession.php b/ctdlphp/ctdlsession.php
index 672d6f636..c9614c753 100644
--- a/ctdlphp/ctdlsession.php
+++ b/ctdlphp/ctdlsession.php
@@ -34,8 +34,15 @@ function establish_citadel_session() {
 	// session, and it's found in the /tmp directory.
 
 	$sockname = "/tmp/" . $session . ".socket" ;
-
-	$clientsocket = fsockopen('unix://' . $sockname, 0, $errno, $errstr, 5);
+	$errno = 0; 
+	$errstr = "";
+	if (is_array(stat($sockname)))
+		$clientsocket = fsockopen(SOCKET_PREFIX.$sockname, 0, $errno, $errstr, 5);
+	else
+		$clientsocket = false;
+//// TODO: if we get connection refused...
+	echo "$socketname - $errno - $errstr";
+	
 	if (!$clientsocket) {
 		// It ain't there, dude.  Open up the proxy. (C version)
 		//$cmd = "./sessionproxy " . $sockname ;
@@ -59,7 +66,10 @@ function establish_citadel_session() {
 		$attempts = 0;
 		while (!$clientsocket) {
 			usleep(100);
-			$clientsocket = fsockopen($sockname, 0, $errno, $errstr, 5);
+			if (is_array(stat($sockname)))
+				$clientsocket = fsockopen(SOCKET_PREFIX.$sockname, 0, $errno, $errstr, 5);
+			else 
+				$clientsocket = false;
 			$attempts += 1;
 			if ($attempts > 100) {
 				echo "ERROR: unable to start connection proxy. ";
@@ -96,7 +106,7 @@ function establish_citadel_session() {
 
 	if (!isset($_SESSION["serv_humannode"])) {
 		$server_info = ctdl_get_serv_info();
-		print_r($server_info);
+		// print_r($server_info);
 		$keys = array_keys($server_info);
 		foreach ($keys as $key)
 			$_SESSION[$key] = $server_info[$key];