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
94a24450
Commit
94a24450
authored
Aug 26, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move back into cnt_stream{}
parent
e50f3e80
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+2
-5
No files found.
bin/varnishd/cache/cache_req_fsm.c
View file @
94a24450
...
@@ -99,12 +99,10 @@ cnt_stream(struct worker *wrk, struct req *req)
...
@@ -99,12 +99,10 @@ cnt_stream(struct worker *wrk, struct req *req)
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
AN
(
bo
->
do_stream
);
AN
(
bo
->
do_stream
);
INCOMPL
();
CHECK_OBJ_NOTNULL
(
req
->
obj
,
OBJECT_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
->
obj
,
OBJECT_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
->
vcl
,
VCL_CONF_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
->
vcl
,
VCL_CONF_MAGIC
);
req
->
res_mode
=
0
;
//
req->res_mode = 0;
AZ
(
bo
->
do_esi
);
AZ
(
bo
->
do_esi
);
...
@@ -225,7 +223,6 @@ cnt_deliver(struct worker *wrk, struct req *req)
...
@@ -225,7 +223,6 @@ cnt_deliver(struct worker *wrk, struct req *req)
wrk
->
handling
=
VCL_RET_DELIVER
;
wrk
->
handling
=
VCL_RET_DELIVER
;
if
(
req
->
busyobj
!=
NULL
)
{
if
(
req
->
busyobj
!=
NULL
)
{
VBO_waitstate
(
req
->
busyobj
,
BOS_FINISHED
);
/* Don't stream if already finished */
/* Don't stream if already finished */
if
(
req
->
busyobj
->
state
!=
BOS_FINISHED
)
{
if
(
req
->
busyobj
->
state
!=
BOS_FINISHED
)
{
AN
(
req
->
busyobj
->
do_stream
);
AN
(
req
->
busyobj
->
do_stream
);
...
@@ -394,7 +391,7 @@ cnt_fetch(struct worker *wrk, struct req *req)
...
@@ -394,7 +391,7 @@ cnt_fetch(struct worker *wrk, struct req *req)
assert
(
bo
->
state
>=
BOS_FETCHING
);
assert
(
bo
->
state
>=
BOS_FETCHING
);
req
->
err_code
=
bo
->
err_code
;
req
->
err_code
=
bo
->
err_code
;
req
->
obj
=
bo
->
fetch_obj
;
req
->
obj
=
bo
->
fetch_obj
;
// XXX: recnt ?
if
(
bo
->
state
==
BOS_FINISHED
)
if
(
bo
->
state
==
BOS_FINISHED
)
VBO_DerefBusyObj
(
wrk
,
&
req
->
busyobj
);
VBO_DerefBusyObj
(
wrk
,
&
req
->
busyobj
);
assert
(
WRW_IsReleased
(
wrk
));
assert
(
WRW_IsReleased
(
wrk
));
...
...
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