'G_mail_seed', 'G_notguar_code', 'G_PG_cons', 'G_PG_cons_n', 'G_PG_vow',
'G_PG_vow_n', 'G_poll_entries', 'G_poll_name', 'G_poll_title',
'G_provider_proxy', 'G_proxy_white_list', 'G_room_about', 'G_room_help',
-'G_room_passwdhowto', 'G_room_roadmap', 'G_room_whysupport',
+'G_room_passwdhowto', 'G_room_roadmap',
'G_selfreg_mask', 'G_selfreg_tout', 'G_shutdown', 'G_sidebanner',
'G_sidebanner_idx', 'G_splash_content', 'G_splash_contents',
'G_splash_cont_idx', 'G_splash_h', 'G_splash_idx', 'G_splash_interval',
function pendpage_try_addcont(&$new_socket, $tout, $method, $header, $get, $post, $cookie, $path, $addr, $rest, $cont)
{
- $pendpage = PendingPage::pendingpage_continue(&$new_socket, $this->curtime, $tout, $method,
+ $pendpage = PendingPage::pendingpage_continue( $new_socket, $this->curtime, $tout, $method,
$header, $get, $post, $cookie,
$path, $addr, $rest, $cont);
foreach ($this->socks as $k => $sock) {
$id = intval($sock);
if (isset($this->s2u[$id])) {
- if ($this->s2u[$id]->the_end) {
- if ($this->s2u[$id]->rd_socket_get() != NULL) {
- $this->s2u[$id]->rd_socket_set(NULL);
+ $user = $this->s2u[$id];
+ if ($user->the_end) {
+ if (($user->rd_toflush == FALSE && $user->rd_step == $user->step)
+ || $user->rd_endtime_is_expired($this->curtime)) {
+ if ($user->rd_socket_get() != NULL) {
+ $user->rd_socket_set(NULL);
+ }
+ unset($this->socks[$id]);
+ unset($this->s2u[$id]);
+ fclose($sock);
+ printf("CLOSE ON GARBAGE MANAGER\n");
}
- unset($this->socks[$id]);
- unset($this->s2u[$id]);
- fclose($sock);
- printf("CLOSE ON GARBAGE MANAGER\n");
}
}
}
return cmd_return(401, 'malformed cmd');
}
$idx = -1;
- if (($user = $this->app->get_user($cmd['sess'], &$idx)) == FALSE)
+ if (($user = $this->app->get_user($cmd['sess'], $idx)) == FALSE)
return cmd_return(402, 'user not found');
if (($user->flags & USER_FLAG_TY_ADMIN) == 0x00)