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
6e493502
Commit
6e493502
authored
Apr 04, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tighten up the management of the do_close flag.
Fixes #890
parent
a36d77c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
cache_center.c
bin/varnishd/cache_center.c
+1
-2
cache_dir.c
bin/varnishd/cache_dir.c
+2
-0
No files found.
bin/varnishd/cache_center.c
View file @
6e493502
...
...
@@ -488,7 +488,6 @@ cnt_fetch(struct sess *sp)
if
(
i
)
{
sp
->
handling
=
VCL_RET_ERROR
;
sp
->
err_code
=
503
;
sp
->
wrk
->
do_close
=
0
;
}
else
{
/*
* These two headers can be spread over multiple actual headers
...
...
@@ -541,6 +540,7 @@ cnt_fetch(struct sess *sp)
}
/* Clean up partial fetch */
AZ
(
sp
->
vbc
);
if
(
sp
->
objcore
!=
NULL
)
{
CHECK_OBJ_NOTNULL
(
sp
->
objcore
,
OBJCORE_MAGIC
);
...
...
@@ -729,7 +729,6 @@ cnt_fetchbody(struct sess *sp)
/* Use unmodified headers*/
i
=
FetchBody
(
sp
);
sp
->
wrk
->
do_close
=
0
;
sp
->
wrk
->
h_content_length
=
NULL
;
http_Setup
(
sp
->
wrk
->
bereq
,
NULL
);
...
...
bin/varnishd/cache_dir.c
View file @
6e493502
...
...
@@ -62,6 +62,7 @@ VDI_CloseFd(struct sess *sp)
sp
->
vbc
->
backend
=
NULL
;
VBE_ReleaseConn
(
sp
->
vbc
);
sp
->
vbc
=
NULL
;
sp
->
wrk
->
do_close
=
0
;
}
/* Recycle a connection ----------------------------------------------*/
...
...
@@ -74,6 +75,7 @@ VDI_RecycleFd(struct sess *sp)
CHECK_OBJ_NOTNULL
(
sp
->
vbc
,
VBC_MAGIC
);
CHECK_OBJ_NOTNULL
(
sp
->
vbc
->
backend
,
BACKEND_MAGIC
);
assert
(
sp
->
vbc
->
fd
>=
0
);
AZ
(
sp
->
wrk
->
do_close
);
bp
=
sp
->
vbc
->
backend
;
...
...
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