$method = $req[0];
if (isset($header['Cookie'])) {
- $cookies = explode(";", $header['Cookie']);
+
+ // LINE: [Cookie:sess=50e053a9511ef; CO_splashdate4=1356420646; CO_list=all; table_idx=7; table_token=510d494986925; lang=it; CO_bin5_pref_ring_endauct=false; CO_splashdate5=1358372822; CO_splashdate1=1363203374; CO_splashdate2=1363374826; __utma=43654517.209888411.1356605271.1356605271.1356605271.1; __utmz=43654517.1356605271.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none)]
+
+ $cookies = explode("; ", $header['Cookie']);
for ($i = 0 ; $i < count($cookies) ; $i++) {
- $nameval = explode("=", trim($cookies[$i]));
- if (count($nameval) != 2) {
- printf("WARNING: malformat cookie element [%s]\n", $cookies[$i]);
+ $name = mb_strstr($cookies[$i], "=", TRUE, 'UTF-8');
+ if ($name == FALSE) {
+ if (mb_strlen($cookies[$i]) > 0) {
+ $cookie[$cookies[$i]] = "";
+ }
+ else {
+ printf("WARNING: malformat cookie element [%s]\n", $cookies[$i]);
+ }
continue;
}
- $cookie[$nameval[0]] = urldecode($nameval[1]);
+
+ $value = mb_substr($cookies[$i], mb_strlen($name)+1, 10140, 'UTF-8');
+ $cookie[$name] = urldecode($value);
}
}
// GET params management
continue;
}
$split = explode(":", $line, 2);
- $header[$split[0]] = $split[1];
+ $hea_id = trim(mb_convert_case($split[0], MB_CASE_TITLE, 'UTF-8'));
+ $header[$hea_id] = $split[1];
}
return $path;
}
}
else if (isset($header['HTTP-Response'])) {
$s = sprintf("HTTP/1.1 %s\r\n", $header['HTTP-Response']);
+ foreach($header as $key => $value) {
+ if (strtolower($key) == "http-response")
+ continue;
+ $s .= sprintf("%s: %s\r\n", $key, $value);
+ }
+ if ($len >= 0) {
+ $s .= sprintf("Content-Length: %ld\r\n", $len);
+ }
}
else {
$s = "HTTP/1.1 200 OK\r\n";
* MAIN
*/
-function chunked_content($zls, $content)
-{
- if ($zls) {
- $cont_comp = $zls->compress_chunk($content);
- }
- else {
- $cont_comp = $content;
- }
- $cont_comp_l = mb_strlen($cont_comp, "ASCII");
- printf("CHUNK: [%s]\n", $content);
-
- return (sprintf("%X\r\n", $cont_comp_l).$cont_comp."\r\n");
-}
-
-function chunked_fini()
-{
- return sprintf("0\r\n");
-}
-
function get_encoding($header)
{
$enc = "plain";
var $s2u; // user associated with input socket
var $s2p; // pending page associated with input socket
var $pending_pages;
+ var $is_daemon;
var $list;
var $in;
}
}
- static function create(&$app, $sockname, $debug, $blocking_mode)
+ static function create(&$app, $sockname, $debug, $blocking_mode, $argv)
{
$thiz = new Sac_a_push();
$thiz->s2u = array();
$thiz->s2p = array();
$thiz->pending_pages = array();
+ $thiz->is_daemon = FALSE;
+
+ if (array_search("-d", $argv) !== FALSE || array_search("--daemon", $argv) !== FALSE) {
+ $thiz->is_daemon = TRUE;
+ }
// create a couple of sockets for control management
if (($sockpair = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM,
GLOBAL $G_splash_w, $G_topbanner, $G_with_donors, $G_with_poll;
GLOBAL $G_with_sidebanner, $G_with_sidebanner2, $G_with_splash;
GLOBAL $G_with_topbanner;
+ GLOBAL $G_tos_vers, $G_tos_fname, $G_tos_dtsoft, $G_tos_dthard, $G_tos_idx, $G_doc_path;
if ($this->main_loop) {
return (FALSE);
$this->main_loop = TRUE;
while ($this->main_loop) {
+ $this->app->sess_cur_set(FALSE);
$this->curtime = time();
fprintf(STDERR, "IN LOOP: Current opened: %d pending_pages: %d\n", count($this->socks), count($this->pending_pages));
/* if ($shutdown) */
/* $read = array_merge(array("$in" => $in), $socks); */
/* else */
- $read = array_merge(array(intval($this->list) => $this->list, intval($this->in) => $this->in,
- intval(static::$cnt_slave) => static::$cnt_slave),
- $this->socks);
+ $pre_read = array_merge(array(intval($this->list) => $this->list,
+ intval(static::$cnt_slave) => static::$cnt_slave),
+ $this->socks);
+ if ($this->is_daemon == FALSE) {
+ $read = array_merge($pre_read, array(intval($this->in) => $this->in));
+ }
+ else {
+ $read = $pre_read;
+ }
if ($this->debug > 1) {
printf("PRE_SELECT\n");
}
$write = NULL;
$except = NULL;
- $num_changed_sockets = @stream_select($read, $write, $except, 5, 500000);
+ $num_changed_sockets = @stream_select($read, $write, $except, 0, 500000);
if ($num_changed_sockets == 0) {
printf(" no data in 5 secs, splash [%d]\n", $G_with_splash);
if ($buf == FALSE || mb_strlen($buf, "ASCII") == 0) {
// close socket case
if ($buf == FALSE) {
- printf("ERROR READING\n");
+ printf("INFO: read return false\n");
}
if ($sock === $this->list) {
printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII"));
if (isset($this->s2u[$id])) {
// $user_a[$s2u[$id]]->disable();
if ($this->s2u[$id]->rd_socket_get() != NULL) {
+ // try to send close frame (for websocket)
+ $clo = $this->s2u[$id]->stream_close();
+ $clo_l = mb_strlen($clo, "ASCII");
+ @fwrite($sock, $clo, $clo_l);
$this->s2u[$id]->rd_socket_set(NULL);
}
unset($this->s2u[$id]);
global_dump();
}
- else if ($line == "shutdown") {
+ else if ($line == "shutdown" || $line == "sd") {
if ($this->app->dump_data()) {
return(0);
}
if (!strncmp($path, SITE_PREFIX, SITE_PREFIX_LEN)) {
$rret = $this->app->request_mgr($this, $header, $header_out, $new_socket, substr($path, SITE_PREFIX_LEN), $addr, $get, $post, $cookie);
}
- fprintf(STDERR, "\n\n DI QUI PASSA [%s]\n\n", $rret);
if ($rret == FALSE) {
// FIXME: manage 404 !!!
printf("TODO: fix unknown page\n");
$content = $user->stream_keepalive(FALSE);
}
if ($content != "") {
- $response = chunked_content($user->rd_zls_get(), $content);
+ $response = $user->chunked_content($content);
}
}
if ($response != "") {
// echo "SPIA: [".substr($response, 0, 60)."...]\n";
- echo "SPIA: [".$response."]\n";
+ // echo "SPIA: [".$response."]\n";
$response_l = mb_strlen($response, "ASCII");
- $wret = @fwrite($sock, $response);
+ $wret = @fwrite($sock, $response, $response_l);
if ($wret < $response_l) {
printf("TROUBLE WITH FWRITE: %d\n", $wret);
$user->rd_cache_set(mb_substr($response, $wret, $response_l - $wret, "ASCII"));
}
unset($this->socks[$id]);
unset($this->s2u[$id]);
+ $clo = $user->stream_close();
+ $clo_l = mb_strlen($clo, "ASCII");
+ @fwrite($sock, $clo, $clo_l);
fclose($sock);
printf("CLOSE ON LOOP\n");
}
projects / brisk.git / blobdiff