gzip compression management added

[brisk.git] / web / Obj / sac-a-push.phh

diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index fa78539..c5faa55 100644 (file)
--- a/web/Obj/sac-a-push.phh
+++ b/web/Obj/sac-a-push.phh
@@ -121,15 +121,17 @@ function headers_render($header, $len)
     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);
@@ -151,11 +153,18 @@ register_shutdown_function('shutta');
  *  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()
@@ -163,6 +172,24 @@ 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;
     
@@ -208,7 +235,10 @@ class Sac_a_push {
 
         $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)) {
@@ -247,9 +277,9 @@ class Sac_a_push {
         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
@@ -305,7 +335,7 @@ class Sac_a_push {
             }
             $write  = NULL;
             $except = NULL;
-            $num_changed_sockets = stream_select($read, $write, $except, 0, 100000);
+            $num_changed_sockets = stream_select($read, $write, $except, 0, 500000);
         
             if ($num_changed_sockets == 0) {
                 printf(" no data in 5 secs ");
@@ -324,7 +354,10 @@ class Sac_a_push {
                     }
                     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();
@@ -348,11 +381,13 @@ class Sac_a_push {
                             $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 !!!
@@ -365,15 +400,18 @@ class Sac_a_push {
                         }
                     }
                     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();
@@ -382,9 +420,10 @@ class Sac_a_push {
                                 }
                                 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);
@@ -449,7 +488,7 @@ class Sac_a_push {
                             $content = $user->stream_keepalive(FALSE);
                         }
                         if ($content != "") {
-                            $response = chunked_content($content);
+                            $response = chunked_content($user->rd_zls_get(), $content);
                         }
                     }