projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
transport API: add header argument to the init methon (required by websocket handshake)
[brisk.git]
/
web
/
briskin5
/
Obj
/
briskin5.phh
diff --git
a/web/briskin5/Obj/briskin5.phh
b/web/briskin5/Obj/briskin5.phh
index
9f22a62
..
0f49f59
100644
(file)
--- a/
web/briskin5/Obj/briskin5.phh
+++ b/
web/briskin5/Obj/briskin5.phh
@@
-503,7
+503,7
@@
class Bin5_user extends User {
}
*/
}
*/
- function spawn($from, &$bri, $table, $table_pos, $get, $post, $cookie)
+
static
function spawn($from, &$bri, $table, $table_pos, $get, $post, $cookie)
{
if (($thiz = new Bin5_user()) == FALSE)
return (FALSE);
{
if (($thiz = new Bin5_user()) == FALSE)
return (FALSE);
@@
-525,7
+525,7
@@
class Bin5_user extends User {
log_wr("Bin5 constructor");
log_wr("Bin5 constructor");
- $thi
s
->privflags = ($CO_bin5_pref_ring_endauct == "true" ? BIN5_USER_FLAG_RING_ENDAUCT : 0) | 0;
+ $thi
z
->privflags = ($CO_bin5_pref_ring_endauct == "true" ? BIN5_USER_FLAG_RING_ENDAUCT : 0) | 0;
$thiz->table_orig = $table;
$thiz->table = 0;
$thiz->table_orig = $table;
$thiz->table = 0;
@@
-1153,6
+1153,8
@@
class Bin5 {
static function request_mgr(&$s_a_p, $header, &$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)
{
+ GLOBAL $G_black_list;
+
printf("NEW_SOCKET (root): %d\n", intval($new_socket));
$enc = get_encoding($header);
printf("NEW_SOCKET (root): %d\n", intval($new_socket));
$enc = get_encoding($header);
@@
-1184,7
+1186,7
@@
class Bin5 {
$content = ob_get_contents();
ob_end_clean();
$content = ob_get_contents();
ob_end_clean();
- $s_a_p->pendpage_try_addflush($
enc, $new_socket, 20
, $header_out, $content);
+ $s_a_p->pendpage_try_addflush($
new_socket, 20, $enc
, $header_out, $content);
return TRUE;
break;
return TRUE;
break;
@@
-1204,7
+1206,7
@@
class Bin5 {
else {
$content = "Bin5 Load data error";
}
else {
$content = "Bin5 Load data error";
}
- $s_a_p->pendpage_try_addflush($
enc, $new_socket, 20
, $header_out, $content);
+ $s_a_p->pendpage_try_addflush($
new_socket, 20, $enc
, $header_out, $content);
return TRUE;
break;
return TRUE;
break;
@@
-1217,7
+1219,7
@@
class Bin5 {
|| (($user = $bri->get_user($cookie['sess'], $idx)) == FALSE)) {
$content = Bin5_user::stream_fini($transp_type, $s_a_p->rndstr, TRUE);
|| (($user = $bri->get_user($cookie['sess'], $idx)) == FALSE)) {
$content = Bin5_user::stream_fini($transp_type, $s_a_p->rndstr, TRUE);
- $s_a_p->pendpage_try_addflush($
enc, $new_socket, 20
, $header_out, $content);
+ $s_a_p->pendpage_try_addflush($
new_socket, 20, $enc
, $header_out, $content);
return TRUE;
break;
return TRUE;
break;
@@
-1231,7
+1233,7
@@
class Bin5 {
}
$content = "";
}
$content = "";
- $user->stream_init($s_a_p->rndstr, $enc, $header_out, $content, $get, $post, $cookie);
+ $user->stream_init($s_a_p->rndstr, $enc, $header
, $header
_out, $content, $get, $post, $cookie);
$response = headers_render($header_out, -1).chunked_content($user->rd_zls_get(), $content);
$response_l = mb_strlen($response, "ASCII");
$response = headers_render($header_out, -1).chunked_content($user->rd_zls_get(), $content);
$response_l = mb_strlen($response, "ASCII");
@@
-1246,7
+1248,7
@@
class Bin5 {
fflush($new_socket);
fflush($new_socket);
- $s_a_p->socks_set($new_socket, $user);
+ $s_a_p->socks_set($new_socket, $user
, NULL
);
$user->rd_socket_set($new_socket);
printf(" - qui ci siamo - ");
return TRUE;
$user->rd_socket_set($new_socket);
printf(" - qui ci siamo - ");
return TRUE;