X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fsac-a-push.phh;h=bc0ea8723922f408766710593460d4f2f9e5a557;hb=64168bc6e7d5cfe46ac0120bb7b449b5d5f37c1b;hp=3c66c126f52a29e0c7f27bbb087dbf4bcbb4df21;hpb=65c6a676cf9a655d33fa48441b1c7390492163fa;p=brisk.git

diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index 3c66c12..bc0ea87 100644
--- a/web/Obj/sac-a-push.phh
+++ b/web/Obj/sac-a-push.phh
@@ -24,6 +24,7 @@
  */
 
 define('SITE_PREFIX', '/brisk/');
+define('SITE_PREFIX_LEN', 7);
 
 function spu_process_info($stream_info, $method, &$header, &$get, &$post, &$cookie)
 {
@@ -173,7 +174,7 @@ class Sac_a_push {
     var $debug;
     var $blocking_mode;
 
-    var $room;
+    var $app;
     var $bin5;
 
     var $curtime;
@@ -187,11 +188,11 @@ class Sac_a_push {
 
     // Sac_a_push::create("/tmp/brisk.sock", 0, 0
 
-    static function create(&$room, $sockname, $debug, $blocking_mode)
+    static function create(&$app, $sockname, $debug, $blocking_mode)
     {        
         $thiz = new Sac_a_push();
         
-        $thiz->room = $room;
+        $thiz->app = $app;
         $thiz->file_socket = $sockname;
         $thiz->unix_socket = "unix://$sockname";
         $thiz->debug = $debug;
@@ -326,7 +327,16 @@ class Sac_a_push {
                             $addr = stream_socket_get_name($new_socket, TRUE);
                             $header_out = array();
 
-                            $this->room->request_mgr($this, $header_out, $new_socket, $path, $addr, $get, $post, $cookie);
+                            $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);
+                            }
+                            if ($rret == FALSE) { 
+                                // FIXME: manage 404 !!!
+                                printf("TODO: fix unknown page\n");
+                            }
                             printf("number of sockets after %d\n", count($this->socks));
                         }
                         else {
@@ -336,7 +346,6 @@ class Sac_a_push {
                     else {
                         if (($buf = fread($sock, 512)) === FALSE) {
                             printf("error read\n");
-                            exit(123);
                         }
                         else if (strlen($buf) === 0) {
                             if ($sock === $this->list) {
@@ -361,7 +370,7 @@ class Sac_a_push {
                             }
                         }
                         else {
-                            if ($debug > 1) {
+                            if ($this->debug > 1) {
                                 print_r($read);
                             }
                             if ($sock === $this->list) {
@@ -380,6 +389,9 @@ class Sac_a_push {
             }
             
 
+            $this->app->garbage_manager(FALSE);
+
+
             /* manage unfinished pages */
             foreach ($this->pages_flush as $k => $pgflush) {
                 if ($pgflush->try_flush($this->curtime) == TRUE) {