From: Matteo Nastasi (mop) Date: Wed, 8 Oct 2014 17:05:20 +0000 (+0200) Subject: Merge branch 'fflush_mgmt' into curls X-Git-Tag: v4.15.0~4^2 X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;ds=inline;h=706f411d26dee22befc679885d715dd620b674e5;hp=-c;p=brisk.git Merge branch 'fflush_mgmt' into curls --- 706f411d26dee22befc679885d715dd620b674e5 diff --combined web/Obj/sac-a-push.phh index ef65115,91012a8..e4e020d --- a/web/Obj/sac-a-push.phh +++ b/web/Obj/sac-a-push.phh @@@ -796,7 -796,7 +796,7 @@@ class Sac_a_push $line = trim($buf); if ($line == "reload") { require("$DOCUMENT_ROOT/Etc/".BRISK_CONF); - $this->app->reload($G_ban_list, $G_black_list); + $this->app->reload(FALSE, $G_ban_list, $G_black_list); global_dump(); } else if ($line == "shutdown" || $line == "sd") { @@@ -874,6 -874,13 +874,13 @@@ $id = intval($sock); if (isset($this->s2u[$id])) { $user = $this->s2u[$id]; + + if ($user->rd_toflush) { + if (fflush($sock) == FALSE) + continue; + else + $user->rd_toflush = FALSE; + } $response = $user->rd_cache_get(); $do_ping = FALSE; if (($this->curtime - $user->lacc) > (EXPIRE_TIME_RD / 3)) { @@@ -911,7 -918,10 +918,10 @@@ else { $user->rd_cache_set(""); } - fflush($sock); + if (fflush($sock) == FALSE) { + $user->rd_toflush = TRUE; + continue; + } $user->rd_kalive_reset($this->curtime); } @@@ -931,9 -941,6 +941,9 @@@ } // if (isset($this->s2u[$id]... } // foreach ($this->socks... printf("\n"); + if (defined('CURL_DE_SAC_VERS')) { + $this->app->cds->process(); + } } // while (... } // function run(...