Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
aa9e09c8
Commit
aa9e09c8
authored
Jul 03, 2012
by
Martin Blix Grydeland
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://git.varnish-cache.org/git/varnish-cache
parents
47dd5d22
88c77374
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
cache_waiter_epoll.c
bin/varnishd/waiter/cache_waiter_epoll.c
+4
-4
No files found.
bin/varnishd/waiter/cache_waiter_epoll.c
View file @
aa9e09c8
...
@@ -133,13 +133,13 @@ vwe_eev(struct vwe *vwe, const struct epoll_event *ep, double now)
...
@@ -133,13 +133,13 @@ vwe_eev(struct vwe *vwe, const struct epoll_event *ep, double now)
SES_Handle
(
sp
,
now
);
SES_Handle
(
sp
,
now
);
}
else
if
(
ep
->
events
&
EPOLLERR
)
{
}
else
if
(
ep
->
events
&
EPOLLERR
)
{
VTAILQ_REMOVE
(
&
vwe
->
sesshead
,
sp
,
list
);
VTAILQ_REMOVE
(
&
vwe
->
sesshead
,
sp
,
list
);
SES_Delete
(
sp
,
"ERR"
,
now
);
SES_Delete
(
sp
,
SC_REM_CLOSE
,
now
);
}
else
if
(
ep
->
events
&
EPOLLHUP
)
{
}
else
if
(
ep
->
events
&
EPOLLHUP
)
{
VTAILQ_REMOVE
(
&
vwe
->
sesshead
,
sp
,
list
);
VTAILQ_REMOVE
(
&
vwe
->
sesshead
,
sp
,
list
);
SES_Delete
(
sp
,
"HUP"
,
now
);
SES_Delete
(
sp
,
SC_REM_CLOSE
,
now
);
}
else
if
(
ep
->
events
&
EPOLLRDHUP
)
{
}
else
if
(
ep
->
events
&
EPOLLRDHUP
)
{
VTAILQ_REMOVE
(
&
vwe
->
sesshead
,
sp
,
list
);
VTAILQ_REMOVE
(
&
vwe
->
sesshead
,
sp
,
list
);
SES_Delete
(
sp
,
"RHUP"
,
now
);
SES_Delete
(
sp
,
SC_REM_CLOSE
,
now
);
}
}
}
}
}
}
...
@@ -192,7 +192,7 @@ vwe_thread(void *priv)
...
@@ -192,7 +192,7 @@ vwe_thread(void *priv)
break
;
break
;
VTAILQ_REMOVE
(
&
vwe
->
sesshead
,
sp
,
list
);
VTAILQ_REMOVE
(
&
vwe
->
sesshead
,
sp
,
list
);
// XXX: not yet VTCP_linger(sp->fd, 0);
// XXX: not yet VTCP_linger(sp->fd, 0);
SES_Delete
(
sp
,
"timeout"
,
now
);
SES_Delete
(
sp
,
SC_RX_TIMEOUT
,
now
);
}
}
}
}
return
(
NULL
);
return
(
NULL
);
...
...
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