*
* TODO
*
- * - partial write for normal page management
+ * WIP - chunked
+ *
+ * - BUG: logout failed
+ * - BUG: fast loop on stream index_rd_ifra page
+ *
+ * - garbage management
+ * - log_legal address fix
* - from room to table
* - from table to room
* - fwrite other issues
* - manage and test cross forwarder between table and room
* - setcookie (for tables only)
* - keepalive management
- * - chunked
*
* DONE/FROZEN - problema con getpeer (HOSTADDR)
*
+ * DONE - bug: read from a not resource handle (already closed because a new socket substitute it)
+ * DONE - partial write for normal page management
* DONE - index_rd_ifra: last_clean issue
* DONE - fwrite failed error management (select, buffer where store unsent data, and fwrite check and retry)
* ABRT - index_wr.php::reload - reload is js-only function
define('SITE_PREFIX', '/brisk/');
-function headers_render($header)
+function headers_render($header, $len)
{
$s = "";
foreach($header as $key => $value) {
$s .= sprintf("%s: %s\r\n", $key, $value);
}
- $s .= "Mop: was/here\r\n";
+ if ($len == -1) {
+ $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";
+ $s .= "Transfer-Encoding: chunked\r\n";
+ }
+ else if ($len > 0) {
+ $s .= sprintf("Content-Length: %d\r\n", $len);
+ }
$s .= "\r\n";
return ($s);
*/
$shutdown = FALSE;
+function chunked_content($content)
+{
+ $content_l = mb_strlen($content, "ASCII");
+
+ return (sprintf("%X\r\n%s\r\n", $content_l, $content));
+}
+
+function chunked_fini()
+{
+ return sprintf("0\r\n");
+}
+
function main()
{
GLOBAL $G_headers;
}
$s2u = array();
+ $pages_flush = array();
$rndstr = "";
for ($i = 0 ; $i < 4096 ; $i++) {
while ($main_loop) {
$curtime = time();
- printf("IN LOOP: Current opened: %d\n", count($socks));
+ printf("IN LOOP: Current opened: %d pages_flush: %d\n", count($socks), count($pages_flush));
/* Prepare the read array */
if ($shutdown)
}
/* At least at one of the sockets something interesting happened */
foreach ($read as $i => $sock) {
+ /* is_resource check is required because there is the possibility that
+ during new request an old connection is closed */
+ if (!is_resource($sock)) {
+ continue;
+ }
if ($sock === $list) {
printf("NUOVA CONNEX\n");
$new_unix = stream_socket_accept($list);
index_main($room, $header_out, $addr, $get, $post, $cookie);
$content = ob_get_contents();
ob_end_clean();
- $content_sz = mb_strlen($content, "LATIN1");
- $hea = headers_render($header_out);
-
- // TODO: FIX THIS PART TO A SPAWN WRITE AS CUEUE.
- printf("OUT: [%d]\n", $content_sz);
- for ($w = 0 ; $w < 10 ; $w++) {
- if (($wret = fwrite($new_socket, $content, $content_sz)) == $content_sz
- || $wret <= 0)
- break;
- printf("wret: [%d]\n", $wret);
- $content = substr($content, $wret, $content_sz - $wret);
- usleep(100000);
+
+ $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content);
+
+ if ($pgflush->try_flush($curtime) == FALSE) {
+ // Add $pgflush to the pgflush array
+ array_push($pages_flush, $pgflush);
}
- fclose($new_socket);
+
break;
case SITE_PREFIX."index_wr.php":
$header_out = array();
- $addr = "";
- // $ret = socket_getpeername($new_socket, $addr);
- printf("RET: %s\n", $addr);
- // exit(123);
ob_start();
index_wr_main($room, $addr, $get, $post, $cookie);
$content = ob_get_contents();
ob_end_clean();
-
- // printf("OUT: [%s]\n", $G_content);
- fwrite($new_socket, headers_render($header_out).$content);
- fclose($new_socket);
+
+ $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content);
+
+ if ($pgflush->try_flush($curtime) == FALSE) {
+ // Add $pgflush to the pgflush array
+ array_push($pages_flush, $pgflush);
+ }
break;
case SITE_PREFIX."index_rd_ifra.php":
do {
$header_out = array();
if (!isset($cookie['sess'])
|| (($user = $room->get_user($cookie['sess'], $idx)) == FALSE)) {
- $body = index_rd_ifra_fini(TRUE);
- fwrite($new_socket, headers_render($header_out).$body);
- fflush($new_socket);
- fclose($new_socket);
+ $content = index_rd_ifra_fini(TRUE);
+
+ $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content);
+
+ if ($pgflush->try_flush($curtime) == FALSE) {
+ // Add $pgflush to the pgflush array
+ array_push($pages_flush, $pgflush);
+ }
break;
}
// close a previous opened index_read_ifra socket, if exists
$user->rd_socket_set(NULL);
}
- $body = "";
- index_rd_ifra_init($room, $user, $header_out, $body, $get, $post, $cookie);
- fwrite($new_socket, headers_render($header_out).$body);
+ $content = "";
+ index_rd_ifra_init($room, $user, $header_out, $content, $get, $post, $cookie);
+
+ $response = headers_render($header_out, -1).chunked_content($content);
+ $response_l = mb_strlen($response, "ASCII");
+
+ $wret = @fwrite($new_socket, $response, $response_l);
+ if ($wret < $response_l) {
+ printf("TROUBLES WITH FWRITE: %d\n", $wret);
+ $user->rd_cache_set(mb_substr($content, $wret, $response_l - $wret, "ASCII"));
+ }
+ else {
+ $user->rd_cache_set("");
+ }
fflush($new_socket);
$s2u[intval($new_socket)] = $idx;
}
}
+
+ foreach ($pages_flush as $k => $pgflush) {
+ if ($pgflush->try_flush($curtime) == TRUE) {
+ unset($pages_flush[$k]);
+ }
+ }
+
foreach ($socks as $k => $sock) {
if (isset($s2u[intval($sock)])) {
$user = $room->user[$s2u[intval($sock)]];
- $body = $user->rd_cache_get();
- if ($body == "")
- index_rd_ifra_main($room, $user, $body);
+ $response = $user->rd_cache_get();
+ if ($response == "") {
+ $content = "";
+ index_rd_ifra_main($room, $user, $content, $get, $post, $cookie);
- if ($body == "" && $user->rd_kalive_is_expired($curtime)) {
- $body = index_rd_ifra_keepalive($user);
+ if ($content == "" && $user->rd_kalive_is_expired($curtime)) {
+ $content = index_rd_ifra_keepalive($user);
+ }
+ if ($content != "") {
+ $response = chunked_content($content);
+ }
}
- if ($body != "") {
- echo "SPIA: [".substr($body, 0, 60)."...]\n";
- $body_l = mb_strlen($body, "LATIN1");
- $ret = @fwrite($sock, $body);
- if ($ret < $body_l) {
- printf("TROUBLE WITH FWRITE: %d\n", $ret);
- $user->rd_cache_set(mb_substr($body, $ret, $body_l - $ret, "LATIN1"));
+ if ($response != "") {
+ echo "SPIA: [".substr($response, 0, 60)."...]\n";
+ $response_l = mb_strlen($response, "ASCII");
+ $wret = @fwrite($sock, $response);
+ if ($wret < $response_l) {
+ printf("TROUBLE WITH FWRITE: %d\n", $wret);
+ $user->rd_cache_set(mb_substr($response, $wret, $response_l - $wret, "ASCII"));
}
else {
$user->rd_cache_set("");