function headers_render($header, $len)
{
-
$s = "";
- $s .= "HTTP/1.1 200 OK\r\n";
+ if (isset($header['Location'])) {
+ return sprintf("HTTP/1.1 302 OK\r\nLocation: %s\r\n\r\n", $header['Location']);
+ }
+ else {
+ $s .= "HTTP/1.1 200 OK\r\n";
+ }
if (!isset($header['Date']))
$s .= sprintf("Date: %s\r\n", date(DATE_RFC822));
if (!isset($header['Connection']))
foreach($header as $key => $value) {
$s .= sprintf("%s: %s\r\n", $key, $value);
}
- if ($len == -1) {
+ if ($len >= 0) {
+ $s .= sprintf("Content-Length: %d\r\n", $len);
+ }
+ else {
$s .= "Cache-Control: no-cache, must-revalidate\r\n";
$s .= "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n";
- $s .= "Content-Encoding: chunked\r\n";
+ if (!isset($header['Content-Encoding'])) {
+ $s .= "Content-Encoding: chunked\r\n";
+ }
$s .= "Transfer-Encoding: chunked\r\n";
}
- else if ($len > 0) {
- $s .= sprintf("Content-Length: %d\r\n", $len);
- }
$s .= "\r\n";
return ($s);
* MAIN
*/
-function chunked_content($content)
+function chunked_content($zls, $content)
{
- $content_l = mb_strlen($content, "ASCII");
+ if ($zls) {
+ $cont_comp = $zls->compress_chunk($content);
+ }
+ else {
+ $cont_comp = $content;
+ }
+ $cont_comp_l = mb_strlen($cont_comp, "ASCII");
+ printf("CHUNK: [%s]\n", $content);
- return (sprintf("%X\r\n%s\r\n", $content_l, $content));
+ return (sprintf("%X\r\n", $cont_comp_l).$cont_comp."\r\n");
}
function chunked_fini()
return sprintf("0\r\n");
}
+function get_encoding($header)
+{
+ $enc = "plain";
+ if (isset($header['Accept-Encoding'])) {
+ $acc = explode(',', $header['Accept-Encoding']);
+
+ if (array_search('gzip', $acc) !== FALSE) {
+ $enc = 'gzip';
+ }
+ else if (array_search('deflate', $acc) !== FALSE) {
+ $enc = 'deflate';
+ }
+ }
+
+ return ($enc);
+}
+
+
class Sac_a_push {
static $fixed_fd = 2;
$thiz->rndstr = "";
for ($i = 0 ; $i < 4096 ; $i++) {
- $thiz->rndstr .= chr(mt_rand(65, 90));
+ if (($i % 128) == 0)
+ $thiz->rndstr .= "\n";
+ else
+ $thiz->rndstr .= chr(mt_rand(65, 90));
}
if (file_exists($thiz->file_socket)) {
unset($this->socks[$id]);
}
- function pgflush_try_add(&$new_socket, $tout, $header_out, $content)
+ function pgflush_try_add($enc, &$new_socket, $tout, $header_out, $content)
{
- $pgflush = new PageFlush($new_socket, $this->curtime, $tout, $header_out, $content);
+ $pgflush = new PageFlush($new_socket, $enc, $this->curtime, $tout, $header_out, $content);
if ($pgflush->try_flush($this->curtime) == FALSE) {
// Add $pgflush to the pgflush array
array_push($this->pages_flush, $pgflush);
}
+ function garbage_manager($force)
+ {
+ $this->app->garbage_manager($force);
+
+ foreach ($this->socks as $k => $sock) {
+ if ($this->s2u[intval($sock)]->sess == '') {
+ if ($this->s2u[intval($sock)]->rd_socket_get() != NULL) {
+ $this->s2u[intval($sock)]->rd_socket_set(NULL);
+ }
+ unset($this->socks[intval($sock)]);
+ unset($this->s2u[intval($sock)]);
+ fclose($sock);
+ printf("CLOSE ON GARBAGE MANAGER\n");
+ }
+ }
+ }
+
function run()
{
if ($this->main_loop) {
}
$write = NULL;
$except = NULL;
- $num_changed_sockets = stream_select($read, $write, $except, 0, 250000);
+ $num_changed_sockets = stream_select($read, $write, $except, 0, 500000);
if ($num_changed_sockets == 0) {
printf(" no data in 5 secs ");
}
if ($sock === $this->list) {
printf("NUOVA CONNEX\n");
- $new_unix = stream_socket_accept($this->list);
+ if (($new_unix = stream_socket_accept($this->list)) == FALSE) {
+ printf("SOCKET_ACCEPT FAILED\n");
+ continue;
+ }
$stream_info = "";
$method = "";
$get = array();
$addr = stream_socket_get_name($new_socket, TRUE);
$header_out = array();
+ $enc = get_encoding($header);
+
$subs = SITE_PREFIX."briskin5/";
$subs_l = strlen($subs);
$rret = FALSE;
if (!strncmp($path, SITE_PREFIX, SITE_PREFIX_LEN)) {
- $rret = $this->app->request_mgr($this, $header_out, $new_socket, substr($path, SITE_PREFIX_LEN), $addr, $get, $post, $cookie);
+ $rret = $this->app->request_mgr($this, $enc, $header_out, $new_socket, substr($path, SITE_PREFIX_LEN), $addr, $get, $post, $cookie);
}
if ($rret == FALSE) {
// FIXME: manage 404 !!!
}
}
else {
- if (($buf = fread($sock, 512)) === FALSE) {
- printf("error read\n");
- }
- else if (strlen($buf) === 0) {
+ $buf = fread($sock, 512);
+ if ($buf == FALSE || strlen($buf) == 0) {
+ if ($buf == FALSE) {
+ printf("ERROR READING\n");
+ }
if ($sock === $this->list) {
printf("Arrivati %d bytes da list\n", strlen($buf));
+ exit(21);
}
else if ($sock === $this->in) {
printf("Arrivati %d bytes da stdin\n", strlen($buf));
+ exit(22);
}
else {
// $user_a[$s2u[intval($sock)]]->disable();
}
unset($this->socks[intval($sock)]);
unset($this->s2u[intval($sock)]);
- fclose($sock);
- printf("CLOSE ON READ\n");
}
+ fclose($sock);
+ printf("CLOSE ON READ\n");
+
if ($this->debug > 1) {
printf("post unset\n");
print_r($this->socks);
}
}
}
-
-
- $this->app->garbage_manager(FALSE);
+ $this->garbage_manager(FALSE);
/* manage unfinished pages */
foreach ($this->pages_flush as $k => $pgflush) {
}
}
+ /*
+ $response: raw stream data not sent
+ $content: html consistent data (<script bla bla>)
+ $user->stream_keepalive($w_ping) ping srv->cli OR srv->cli + cli->srv if $w_ping == TRUE
+ */
+
/* manage open streaming */
foreach ($this->socks as $k => $sock) {
if (isset($this->s2u[intval($sock)])) {
$user = $this->s2u[intval($sock)];
$response = $user->rd_cache_get();
- if (($this->curtime - $user->lacc) <= (EXPIRE_TIME_RD / 2)) {
+ $do_ping = FALSE;
+ if (($this->curtime - $user->lacc) > (EXPIRE_TIME_RD / 3)) {
+ $do_ping = TRUE;
+ }
+ else {
$user->ping_req = FALSE;
}
+
if ($response == "") {
$content = "";
$user->stream_main($content, $get, $post, $cookie);
printf("[%s] [%d] [%d]\n", $user->name, $user->lacc, $this->curtime);
- if ($content == "" && $user->ping_req == FALSE
- && (($this->curtime - $user->lacc) > (EXPIRE_TIME_RD / 2))) {
- $content = $user->stream_ping();
+ if ($do_ping && $user->ping_req == FALSE) {
+ $content .= $user->stream_keepalive(TRUE);
$user->ping_req = TRUE;
}
- if ($content == "" && $user->rd_kalive_is_expired($this->curtime)) {
- $content = $user->stream_keepalive();
+ else if ($content == "" && $user->rd_kalive_is_expired($this->curtime)) {
+ $content = $user->stream_keepalive(FALSE);
}
if ($content != "") {
- $response = chunked_content($content);
+ $response = chunked_content($user->rd_zls_get(), $content);
}
}
if ($response != "") {
- echo "SPIA: [".substr($response, 0, 60)."...]\n";
+ // echo "SPIA: [".substr($response, 0, 60)."...]\n";
+ echo "SPIA: [".$response."]\n";
$response_l = mb_strlen($response, "ASCII");
$wret = @fwrite($sock, $response);
if ($wret < $response_l) {
} // function run(...
}
-?>
\ No newline at end of file
+?>