X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=brisk.git;a=blobdiff_plain;f=web%2Fspush%2Fbrisk-spush.phh;h=8ff55c1e0d002668d349aabd52914449104df8ca;hp=3de49efa86aaa434b29e383c073cfb31a8f495af;hb=0b6452e28c5b16fbbde6191a6db4293905b808e3;hpb=3269331d0e5f2dbad822ca34c33761104edb7dea diff --git a/web/spush/brisk-spush.phh b/web/spush/brisk-spush.phh index 3de49ef..8ff55c1 100644 --- a/web/spush/brisk-spush.phh +++ b/web/spush/brisk-spush.phh @@ -24,13 +24,14 @@ $DOCUMENT_ROOT=""; $HTTP_HOST="dodo.birds.lan"; -define('USOCK_PATH', "/tmp/brisk.sock"); +define('USOCK_PATH_PFX', "/tmp/brisk"); +define('USOCK_POOL_N', 10); -define('PENDINGPAGE_WAITDATA', 0); -define('PENDINGPAGE_FLUSHING', 1); +define('PENDINGPAGE_CONTINUE', 0); +define('PENDINGPAGE_WAITDATA', 1); +define('PENDINGPAGE_FLUSH', 2); class PendingPage { - var $socket; // socket handler of page stream var $status; // status can be 0: waiting for data, 1: flush phase @@ -38,18 +39,85 @@ class PendingPage { var $msg; // place where store failed fwrite data var $msg_sz; // size of content - - - function PendingPage($socket) + 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 bytes + var $cont; // content of unfinished POST + + function PendingPage($socket, $curtime, $kalive) { $this->socket = $socket; + // fprintf(STDERR, "SOCKET ADD: %s\n", $this->socket); + $this->kalive = $curtime + $kalive; + } + + static function pendingpage_continue($socket, $curtime, $kalive, $method, + $header, $get, $post, $cookie, + $path, $addr, $rest, $cont) + { + $thiz = static::pendingpage_staminal($socket, PENDINGPAGE_CONTINUE, $curtime, $kalive, $method, + $header, $get, $post, $cookie, $path, $addr, $rest, $cont); + $thiz->to_continuing(); + + return $thiz; + } + + function context_get(&$header, &$socket, &$path, &$addr, &$get, &$post, &$cookie) + { + $header = $this->header; + $socket = $this->socket; + $path = $this->path; + $addr = $this->addr; + $get = $this->get; + post_manage($post, $this->cont); + $cookie = $this->cookie; + fprintf(STDERR, "SOCKET GET: %s\n", $this->socket); + } + + function to_continuing() + { + // printf("TRY FLUSH CREATE\n"); + $header = array(); + $header['HTTP-Response'] = "100 Continue"; + $hea = headers_render($header, 0); + $hea_sz = mb_strlen($hea, "ASCII"); + + $this->status = PENDINGPAGE_CONTINUE; + $this->msg = $hea; + $this->msg_sz = $hea_sz; + } + + static function pendingpage_waiting($socket, $curtime, $kalive, $method, $header, + $get, $post, $cookie, $path, $addr, $rest, $cont) + { + return (static::pendingpage_staminal($socket, PENDINGPAGE_WAITDATA, $curtime, $kalive, $method, + $header, $get, $post, $cookie, $path, $addr, $rest, $cont)); } - static function pendingpage_waiting($socket, $method, $header, $get, $post, $cookie, $path, $addr) + static function pendingpage_staminal($socket, $status, $curtime, $kalive, $method, $header, + $get, $post, $cookie, $path, $addr, $rest, $cont) { - $thiz = new PendingPage($socket); + $thiz = new PendingPage($socket, $curtime, $kalive); + $thiz->status = $status; + + $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; + $thiz->cont = $cont; - // TODO + return ($thiz); } function try_wait($curtime) @@ -58,18 +126,18 @@ class PendingPage { // if timeout or max content dimension is exceeded move to flushing } - static function pendingpage_flushing($socket, $enc, $curtime, $kalive, $header_out, $body) + static function pendingpage_flushing($socket, $curtime, $kalive, $enc, $header_out, $body) { - $thiz = new PendingPage($socket); + $thiz = new PendingPage($socket, $curtime, $kalive); - $thiz->to_flushing($enc, $curtime, $kalive, $header_out, $body); + $thiz->to_flushing($enc, $header_out, $body); return ($thiz); } - function to_flushing($enc, $curtime, $kalive, $header_out, $body) + function to_flushing($enc, &$header_out, $body) { - printf("TRY FLUSH CREATE\n"); + // printf("TRY FLUSH CREATE: enc[%s]\n", $enc); $body_out = ZLibStream::compress($enc, $body); if ($enc != 'plain') $header_out['Content-Encoding'] = $enc; @@ -77,42 +145,54 @@ class PendingPage { $hea = headers_render($header_out, $body_out_sz); $hea_sz = mb_strlen($hea, "ASCII"); - $this->status = PENDINGPAGE_FLUSHING; - $this->kalive = $curtime + $kalive; + $this->status = PENDINGPAGE_FLUSH; $this->msg = $hea.$body_out; $this->msg_sz = $hea_sz + $body_out_sz; + // printf("TRY FLUSH CREATE: enc[%s]\n", $enc); } /* return TRUE if is removable from it's list */ function try_flush($curtime) { - if ($this->status != PENDINGPAGE_FLUSHING) + // fprintf(STDERR, "IMPORTANT: TRY_FLUSH: start %d\n", $this->status); + if ($this->status != PENDINGPAGE_FLUSH && + $this->status != PENDINGPAGE_CONTINUE) return (FALSE); - printf("TRY FLUSH IN\n"); if ($this->kalive < $curtime) { - printf("TRY FLUSH CLOSE 1\n"); - fclose($this->socket); + // printf("TRY FLUSH CLOSE 1\n"); + @fclose($this->socket); return TRUE; } - $wret = @fwrite($this->socket, $this->msg); + $wret = @fwrite($this->socket, $this->msg, mb_strlen($this->msg, "ASCII")); if ($wret == FALSE && $wret !== FALSE) { - printf("TRY FLUSH PendingPage::try_flush: wret 0 but not FALSE\n"); + // printf("TRY FLUSH PendingPage::try_flush: wret 0 but not FALSE [%d]\n", mb_strlen($this->msg, "ASCII")); } if ($wret == $this->msg_sz) { - printf("TRY FLUSH CLOSE 2\n"); - fclose($this->socket); - return TRUE; + if ($this->status == PENDINGPAGE_CONTINUE) { + $this->status = PENDINGPAGE_WAITDATA; + return FALSE; + } + else { + // printf("TRY FLUSH CLOSE 2\n"); + fclose($this->socket); + return TRUE; + } } $this->msg_sz -= $wret; $this->msg = mb_substr($this->msg, $wret, $this->msg_sz, "ASCII"); - printf("TRY FLUSH RETURN FALSE\n"); + // printf("TRY FLUSH RETURN FALSE\n"); return FALSE; } -} + function socket_get() + { + return ($this->socket); + } + +} // class PendingPage { ?>