projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rest var added to manage partial POST requests, request_mgr factorized between partia...
[brisk.git]
/
web
/
Obj
/
brisk.phh
diff --git
a/web/Obj/brisk.phh
b/web/Obj/brisk.phh
index
09ea77f
..
94086cc
100644
(file)
--- a/
web/Obj/brisk.phh
+++ b/
web/Obj/brisk.phh
@@
-928,7
+928,7
@@
class Room
// for test: $prefs = new Client_prefs(USER_FLAG_LISTAUTH >> 2);
$prefs = new Client_prefs(($user->flags & USER_FLAG_MAP_AUTH) >> 2);
// for test: $prefs = new Client_prefs(USER_FLAG_LISTAUTH >> 2);
$prefs = new Client_prefs(($user->flags & USER_FLAG_MAP_AUTH) >> 2);
- $ret .= sprintf('prefs_load(\'%s\');', json_encode($prefs));
+ $ret .= sprintf('prefs_load(\'%s\'
, false, false
);', json_encode($prefs));
if(false) {
if ($user->flags & USER_FLAG_ISOLAUTH) {
if(false) {
if ($user->flags & USER_FLAG_ISOLAUTH) {
@@
-2191,7
+2191,7
@@
class Room
function request_mgr(&$s_a_p, $header, &$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)
);
+ printf("NEW_SOCKET (root): %d
PATH [%s]\n", intval($new_socket), $path
);
$enc = get_encoding($header);
if (isset($header['User-Agent'])) {
$enc = get_encoding($header);
if (isset($header['User-Agent'])) {
@@
-2215,17
+2215,24
@@
class Room
$content = ob_get_contents();
ob_end_clean();
$content = ob_get_contents();
ob_end_clean();
- $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+ fprintf(STDERR, "\n\nCONTENT [%s]\n\n", $content);
+ $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
return TRUE;
break;
case "index_wr.php":
return TRUE;
break;
case "index_wr.php":
+ //
+ // Enhance required: in the POST case, after the header you must get content
+ // from the socket, waiting if necessary
+ //
+
+ fprintf(STDERR, "\n\nDENTRO QUI\n\n");
ob_start();
index_wr_main($this, $addr, $get, $post, $cookie);
$content = ob_get_contents();
ob_end_clean();
ob_start();
index_wr_main($this, $addr, $get, $post, $cookie);
$content = ob_get_contents();
ob_end_clean();
- $s_a_p->p
gflush_try_add($enc, $new_socket, 20
, $header_out, $content);
+ $s_a_p->p
endpage_try_addflush($new_socket, 20, $enc
, $header_out, $content);
return TRUE;
break;
return TRUE;
break;
@@
-2238,7
+2245,7
@@
class Room
$content = User::stream_fini($transp, $s_a_p->rndstr, TRUE);
$content = User::stream_fini($transp, $s_a_p->rndstr, TRUE);
- $s_a_p->p
gflush_try_add($enc, $new_socket, 20
, $header_out, $content);
+ $s_a_p->p
endpage_try_addflush($new_socket, 20, $enc
, $header_out, $content);
return TRUE;
break;
return TRUE;
break;
@@
-2268,7
+2275,7
@@
class Room
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;