From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Wed, 14 Nov 2012 06:40:10 +0000 (+0100)
Subject: header passed to _mgr functions
X-Git-Tag: v4.1.0~1
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=95fab8a421e10d8ed1174a76971bb585e81cc8a0;p=brisk.git

header passed to _mgr functions
---

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index a94412e..bb51cb6 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2133,10 +2133,12 @@ class Room {
     return ($ret);
   }
 
-  function request_mgr(&$s_a_p, $enc, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
+  function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
   {
       printf("NEW_SOCKET (root): %d\n", intval($new_socket));
 
+      $enc = get_encoding($header);
+
       force_no_cache($header_out);
 
       switch ($path) {
@@ -2211,7 +2213,7 @@ class Room {
           $subs = "briskin5/";
           $subs_l = strlen($subs);
           if (!strncmp($path, $subs, $subs_l)) {
-              $ret = Bin5::request_mgr(&$s_a_p, $enc, &$header_out, &$new_socket, substr($path, $subs_l) , $addr, $get, $post, $cookie);
+              $ret = Bin5::request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, substr($path, $subs_l) , $addr, $get, $post, $cookie);
               return ($ret);
           }
           break;
diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 815c8b4..52cedc5 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -1387,10 +1387,12 @@ class Bin5 {
         return ($is_ab);
     }
 
-    static function request_mgr(&$s_a_p, $enc, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
+    static function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
     {
         printf("NEW_SOCKET (root): %d\n", intval($new_socket));
         
+        $enc = get_encoding($header);
+
         if (($table_idx = gpcs_var('table_idx', $get, $post, $cookie)) === FALSE) 
             unset($table_idx);