X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fspush%2Fbrisk-spush.phh;h=5b736fbc031cdb9eb9d61a39e24cc84be8ea69ce;hb=d79148fdd170bec2b88a3289ad8d2ae229163cc7;hp=4728b923af5932608b242c38063814e023ccec6e;hpb=9b4ce3e614e0636bc76fee81d5c1ec41ae5bd742;p=brisk.git

diff --git a/web/spush/brisk-spush.phh b/web/spush/brisk-spush.phh
index 4728b92..5b736fb 100644
--- a/web/spush/brisk-spush.phh
+++ b/web/spush/brisk-spush.phh
@@ -24,15 +24,71 @@
 
 $DOCUMENT_ROOT="";
 $HTTP_HOST="dodo.birds.lan";
+define('USOCK_PATH', "/tmp/brisk.sock");
 
-class PageFlush {
+define('PENDINGPAGE_WAITDATA', 0);
+define('PENDINGPAGE_FLUSH', 1);
+
+class PendingPage {
 
   var $socket; // socket handler of page stream
+  var $status; // status can be 0: waiting for data, 1: flush phase
+
   var $kalive; // if no message are sent after RD_KEEPALIVE_TOUT secs we send a keepalive from server
   var $msg;    // place where store failed fwrite data
   var $msg_sz; // size of content
 
-  function PageFlush($socket, $enc, $curtime, $kalive, $header_out, $body)
+  var $method; // method used to request the page
+  var $header; // array of header fields
+  var $get;    // array of get args
+  var $post;   // array of post args
+  var $cookie; // array of cookie args
+  var $path;   // requested path
+  var $addr;   // source address
+  var $contsz; // expected content size
+  var $rest;   // number of missing bytest
+
+  function PendingPage($socket, $curtime, $kalive)
+  {
+      $this->socket = $socket;
+      $this->kalive = $curtime + $kalive;
+  }
+
+  static function pendingpage_waiting($socket, $curtime, $kalive, $method, $header,
+                                      $get, $post, $cookie, $path, $addr, $rest)
+  {
+      $thiz = new PendingPage($socket, $curtime, $kalive);
+      $thiz->status = PENDINGPAGE_WAITDATA;
+
+      $thiz->method = $method;
+      $thiz->header = $header;
+      $thiz->get    = $get;
+      $thiz->post   = $post;
+      $thiz->cookie = $cookie;
+      $thiz->path   = $path;
+      $thiz->addr   = $addr;
+      $thiz->contsz = $header['Content-Length'];
+      $thiz->rest   = $rest;
+
+      return ($thiz);
+  }
+
+  function try_wait($curtime)
+  {
+      // if completed return TRUE to allow data to be processed, 
+      // if timeout or max content dimension is exceeded move to flushing
+  }
+
+  static function pendingpage_flushing($socket, $curtime, $kalive, $enc, $header_out, $body)
+  {
+      $thiz = new PendingPage($socket, $curtime, $kalive);
+
+      $thiz->to_flushing($enc, $header_out, $body);
+
+      return ($thiz);
+  }
+
+  function to_flushing($enc, &$header_out, $body)
   {
       printf("TRY FLUSH CREATE\n");
       $body_out = ZLibStream::compress($enc, $body);
@@ -42,8 +98,7 @@ class PageFlush {
       $hea = headers_render($header_out, $body_out_sz);
       $hea_sz = mb_strlen($hea, "ASCII");
 
-      $this->socket = $socket;
-      $this->kalive = $curtime + $kalive;
+      $this->status = PENDINGPAGE_FLUSH;
       $this->msg    = $hea.$body_out;
       $this->msg_sz = $hea_sz + $body_out_sz;
   }
@@ -51,6 +106,9 @@ class PageFlush {
   /* return TRUE if is removable from it's list */
   function try_flush($curtime)
   {
+      if ($this->status != PENDINGPAGE_FLUSH)
+          return (FALSE);
+
       printf("TRY FLUSH IN\n");
       if ($this->kalive < $curtime) {
           printf("TRY FLUSH CLOSE 1\n");
@@ -60,7 +118,7 @@ class PageFlush {
 
       $wret = @fwrite($this->socket, $this->msg);
       if ($wret == FALSE && $wret !== FALSE) {
-          printf("TRY FLUSH PageFlush::try_flush: wret 0 but not FALSE\n");
+          printf("TRY FLUSH PendingPage::try_flush: wret 0 but not FALSE\n");
       }
       if ($wret == $this->msg_sz) {
           printf("TRY FLUSH CLOSE 2\n");