webservers_exceeded() and check_webservers() functions added to change behaviour...

[brisk.git] / web / briskin5 / index_rd.php

diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index 0dab464..75081a7 100644 (file)
--- a/web/briskin5/index_rd.php
+++ b/web/briskin5/index_rd.php
@@ -95,7 +95,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     ignore_user_abort(TRUE);
     if  ($first_loop == TRUE) {
 
-        if (($sem = Bin5::lock_data($table_idx)) != FALSE) { 
+        if (($sem = Bin5::lock_data(TRUE, $table_idx)) != FALSE) { 
             // Aggiorna l'expire time lato server
             $S_load_stat['U_first_loop']++;
 
@@ -126,7 +126,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             log_main("infolock: U");
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
-        } // if (($sem = Bin5::lock_data($table ...
+        } // if (($sem = Bin5::lock_data(TRUE, $table ...
         else {
             ignore_user_abort(FALSE);
             
@@ -147,7 +147,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     if ($user == FALSE) {
         do {
             ignore_user_abort(TRUE);
-            if (($sem = Bin5::lock_data($table_idx)) == FALSE) 
+            if (($sem = Bin5::lock_data(TRUE, $table_idx)) == FALSE) 
                 break;
             
             log_main("infolock: P");
@@ -175,17 +175,19 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         /*
          *  if $cur_step == -1 load the current state from the main struct
          */
+        
+        /* unset the $user var to reload it from main structure */
+        unset($user);
+
         ignore_user_abort(TRUE);
-        $sem = Bin5::lock_data($table_idx);
+        $sem = Bin5::lock_data(TRUE, $table_idx);
         if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
             return (blocking_error(TRUE));
         }
         $S_load_stat['R_minusone']++;
-        
-        /* unset the $user var to reload it from main structure */
-        unset($user);
+
         if (($user = $bri->get_user($sess, $idx)) == FALSE) {
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
@@ -239,7 +241,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     }
     else {
         ignore_user_abort(TRUE);
-        $sem = Bin5::lock_data($table_idx);
+        $sem = Bin5::lock_data(TRUE, $table_idx);
         // if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
         if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
             Bin5::unlock_data($sem);
@@ -274,6 +276,8 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             if ($user->the_end == TRUE) {
                 log_rd2("LOGOUT BYE BYE!!");
                 log_auth($user->sess, "Explicit logout.");
+
+                unset($user);
                 
                 $S_load_stat['R_the_end']++;
                 if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
@@ -281,7 +285,6 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                     ignore_user_abort(FALSE);
                     return (blocking_error(TRUE));
                 }
-                unset($user);
                 if (($user = $bri->get_user($sess, $idx)) == FALSE) {
                     Bin5::unlock_data($sem);
                     ignore_user_abort(FALSE);
@@ -325,7 +328,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
    step
 */
 
-$is_page_streaming =  (stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE);
+$is_page_streaming =  (webservers_exceeded() || stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE);
 
 header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past