From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Wed, 8 Oct 2014 17:05:36 +0000 (+0200)
Subject: Merge branch 'curls' into curl-out-reason
X-Git-Tag: v4.15.0~4
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=aa1fa37d0bd35d6f8d7b55ec1a6a92140f4ce9e0;hp=-c;p=brisk.git

Merge branch 'curls' into curl-out-reason
---

aa1fa37d0bd35d6f8d7b55ec1a6a92140f4ce9e0
diff --combined web/Obj/user.phh
index b3cbf51,68b686d..6cdb1fe
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@@ -129,6 -129,7 +129,7 @@@ class User 
    var $rd_scristp; // current script step (for each session) 
    var $rd_kalive;  // if no message are sent after RD_KEEPALIVE_TOUT secs we send a keepalive from server
    var $rd_cache;   // place where store failed fwrite data
+   var $rd_toflush; // bool to inform about unfflushed socket
    var $rd_zls;     // zlibstream object handle if compressed stream, else FALSE
    var $rd_transp;  // class that define stream encapsulation type (iframe, xhr, ...)
    var $rd_is_chunked; // is the transport chunked or not ?
@@@ -190,6 -191,7 +191,7 @@@
      $thiz->rd_scristp = -1;
      $thiz->rd_kalive  = -1;
      $thiz->rd_cache   = "";
+     $thiz->td_toflush = FALSE;
      $thiz->rd_zls     = FALSE;
      $thiz->rd_transp  = NULL;
      $thiz->rd_is_chunked = FALSE;
@@@ -749,16 -751,19 +751,16 @@@
                    log_rd2("LOGOUT BYE BYE!!");
                    log_auth($this->sess, "Explicit logout.");
                    
 -                  if ($this->the_end == TRUE) {
 -                      $this->reset();
 -                      
 -                      if ($this->subst == 'sitdown') {
 -                          log_load("ROOM WAKEUP");
 -                          $this->room->room_wakeup($this);
 -                      }
 -                      else if ($this->subst == 'standup')
 -                          $this->room->room_outstandup($this);
 -                      else
 -                          log_rd2("LOGOUT FROM WHAT ???");
 -                      
 -                  } /* if ($this->the_end == TRUE) { ... */
 +                  $this->reset();
 +
 +                  if ($this->subst == 'sitdown') {
 +                      log_load("ROOM WAKEUP");
 +                      $this->room->room_wakeup($this);
 +                  }
 +                  else if ($this->subst == 'standup')
 +                      $this->room->room_outstandup($this);
 +                  else
 +                      log_rd2("LOGOUT FROM WHAT ???");
                } /* if ($this->the_end == TRUE) { ... */
            } /* if ($this->rd_step < $this->step) { */
        }  /* else of if ($this->rd_step == -1) { */