Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
0854c5dc
Commit
0854c5dc
authored
Nov 07, 2011
by
Tollef Fog Heen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make it possible to limit the total transfer time.
Set the default total transfer time to 600s.
parent
835a0722
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
2 deletions
+18
-2
cache_acceptor.c
bin/varnishd/cache_acceptor.c
+2
-2
cache_wrw.c
bin/varnishd/cache_wrw.c
+8
-0
heritage.h
bin/varnishd/heritage.h
+1
-0
mgt_param.c
bin/varnishd/mgt_param.c
+7
-0
No files found.
bin/varnishd/cache_acceptor.c
View file @
0854c5dc
...
...
@@ -234,9 +234,9 @@ vca_acct(void *arg)
t0
=
TIM_real
();
while
(
1
)
{
#ifdef SO_SNDTIMEO_WORKS
if
(
params
->
send_timeout
!=
send_timeout
)
{
if
(
params
->
idle_
send_timeout
!=
send_timeout
)
{
need_test
=
1
;
send_timeout
=
params
->
send_timeout
;
send_timeout
=
params
->
idle_
send_timeout
;
tv_sndtimeo
=
TIM_timeval
(
send_timeout
);
VTAILQ_FOREACH
(
ls
,
&
heritage
.
socks
,
list
)
{
if
(
ls
->
sock
<
0
)
...
...
bin/varnishd/cache_wrw.c
View file @
0854c5dc
...
...
@@ -133,6 +133,14 @@ WRW_Flush(struct worker *w)
*/
size_t
used
=
0
;
if
(
TIM_real
()
-
w
->
sp
->
t_resp
>
params
->
send_timeout
)
{
WSL
(
w
,
SLT_Debug
,
*
wrw
->
wfd
,
"Hit total send timeout, wrote = %ld/%ld; not retrying"
,
i
,
wrw
->
liov
);
i
=
-
1
;
break
;
}
WSL
(
w
,
SLT_Debug
,
*
wrw
->
wfd
,
"Hit send timeout, wrote = %ld/%ld; retrying"
,
i
,
wrw
->
liov
);
...
...
bin/varnishd/heritage.h
View file @
0854c5dc
...
...
@@ -110,6 +110,7 @@ struct params {
unsigned
sess_timeout
;
unsigned
pipe_timeout
;
unsigned
send_timeout
;
unsigned
idle_send_timeout
;
/* Management hints */
unsigned
auto_restart
;
...
...
bin/varnishd/mgt_param.c
View file @
0854c5dc
...
...
@@ -612,6 +612,13 @@ static const struct parspec input_parspec[] = {
"seconds the session is closed.
\n
"
"See setsockopt(2) under SO_SNDTIMEO for more information."
,
DELAYED_EFFECT
,
"600"
,
"seconds"
},
{
"idle_send_timeout"
,
tweak_timeout
,
&
master
.
idle_send_timeout
,
0
,
0
,
"Time to wait with no data sent. "
"If no data has been transmitted in this many
\n
"
"seconds the session is closed.
\n
"
"See setsockopt(2) under SO_SNDTIMEO for more information."
,
DELAYED_EFFECT
,
"60"
,
"seconds"
},
{
"auto_restart"
,
tweak_bool
,
&
master
.
auto_restart
,
0
,
0
,
"Restart child process automatically if it dies.
\n
"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment