projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pendpage_try_addflush signature changed
[brisk.git]
/
web
/
Obj
/
sac-a-push.phh
diff --git
a/web/Obj/sac-a-push.phh
b/web/Obj/sac-a-push.phh
index
fe8ec42
..
a69ea1d
100644
(file)
--- a/
web/Obj/sac-a-push.phh
+++ b/
web/Obj/sac-a-push.phh
@@
-489,19
+489,19
@@
class Sac_a_push {
unset($this->socks[$id]);
}
unset($this->socks[$id]);
}
- function pendpage_try_addflush(
$enc, &$new_socket, $tout
, $header_out, $content)
+ function pendpage_try_addflush(
&$new_socket, $tout, $enc
, $header_out, $content)
{
{
- $p
gflush = PendingPage::pendingpage_flushing($new_socket, $enc, $this->curtime, $tout
, $header_out, $content);
+ $p
endpage = PendingPage::pendingpage_flushing($new_socket, $this->curtime, $tout, $enc
, $header_out, $content);
- if ($p
gflush
->try_flush($this->curtime) == FALSE) {
- // Add $p
gflush to the pgflush
array
- $this->p
gflush_add($pgflush
);
+ if ($p
endpage
->try_flush($this->curtime) == FALSE) {
+ // Add $p
endpage to the pendpage
array
+ $this->p
endpage_add($pendpage
);
}
}
}
}
- function p
gflush_add($pgflush
)
+ function p
endpage_add($pendpage
)
{
{
- array_push($this->pending_pages, $p
gflush
);
+ array_push($this->pending_pages, $p
endpage
);
}
function garbage_manager($force)
}
function garbage_manager($force)
@@
-560,7
+560,7
@@
class Sac_a_push {
}
$write = NULL;
$except = NULL;
}
$write = NULL;
$except = NULL;
- $num_changed_sockets = @stream_select($read, $write, $except,
0
, 500000);
+ $num_changed_sockets = @stream_select($read, $write, $except,
5
, 500000);
if ($num_changed_sockets == 0) {
printf(" no data in 5 secs, splash [%d]\n", $G_with_splash);
if ($num_changed_sockets == 0) {
printf(" no data in 5 secs, splash [%d]\n", $G_with_splash);