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
9aa8317d
Commit
9aa8317d
authored
Feb 15, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Zero the wrk->vgz_rx pointer once we have freed it.
parent
e974d51f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
cache_esi_fetch.c
bin/varnishd/cache_esi_fetch.c
+1
-0
cache_fetch.c
bin/varnishd/cache_fetch.c
+2
-0
cache_gzip.c
bin/varnishd/cache_gzip.c
+5
-0
No files found.
bin/varnishd/cache_esi_fetch.c
View file @
9aa8317d
...
...
@@ -304,6 +304,7 @@ vfp_esi_begin(struct sess *sp, size_t estimate)
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
/* XXX: snapshot WS's ? We'll need the space */
AZ
(
sp
->
wrk
->
vgz_rx
);
if
(
sp
->
wrk
->
is_gzip
&&
sp
->
wrk
->
do_gunzip
)
{
sp
->
wrk
->
vgz_rx
=
VGZ_NewUngzip
(
sp
,
"U F E"
);
VEP_Init
(
sp
,
NULL
);
...
...
bin/varnishd/cache_fetch.c
View file @
9aa8317d
...
...
@@ -504,6 +504,7 @@ FetchBody(struct sess *sp, const struct http *hp)
* XXX: Missing: RFC2616 sec. 4.4 in re 1xx, 204 & 304 responses
*/
AZ
(
sp
->
wrk
->
vgz_rx
);
AZ
(
VTAILQ_FIRST
(
&
sp
->
obj
->
store
));
switch
(
sp
->
wrk
->
body_status
)
{
case
BS_NONE
:
...
...
@@ -537,6 +538,7 @@ FetchBody(struct sess *sp, const struct http *hp)
INCOMPL
();
}
XXXAZ
(
sp
->
wrk
->
vfp
->
end
(
sp
));
AZ
(
sp
->
wrk
->
vgz_rx
);
/*
* It is OK for ->end to just leave the last storage segment
* sitting on sp->wrk->storage, we will always call vfp_nop_end()
...
...
bin/varnishd/cache_gzip.c
View file @
9aa8317d
...
...
@@ -393,6 +393,7 @@ static void __match_proto__()
vfp_gunzip_begin
(
struct
sess
*
sp
,
size_t
estimate
)
{
(
void
)
estimate
;
AZ
(
sp
->
wrk
->
vgz_rx
);
sp
->
wrk
->
vgz_rx
=
VGZ_NewUngzip
(
sp
,
"U F -"
);
}
...
...
@@ -438,6 +439,7 @@ vfp_gunzip_end(struct sess *sp)
struct
vgz
*
vg
;
vg
=
sp
->
wrk
->
vgz_rx
;
sp
->
wrk
->
vgz_rx
=
NULL
;
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
VGZ_Destroy
(
&
vg
);
sp
->
obj
->
gziped
=
0
;
...
...
@@ -462,6 +464,7 @@ vfp_gzip_begin(struct sess *sp, size_t estimate)
{
(
void
)
estimate
;
AZ
(
sp
->
wrk
->
vgz_rx
);
sp
->
wrk
->
vgz_rx
=
VGZ_NewGzip
(
sp
,
"G F -"
);
}
...
...
@@ -507,6 +510,7 @@ vfp_gzip_end(struct sess *sp)
int
i
;
vg
=
sp
->
wrk
->
vgz_rx
;
sp
->
wrk
->
vgz_rx
=
NULL
;
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
do
{
VGZ_Ibuf
(
vg
,
""
,
0
);
...
...
@@ -587,6 +591,7 @@ vfp_testgzip_end(struct sess *sp)
struct
vgz
*
vg
;
vg
=
sp
->
wrk
->
vgz_rx
;
sp
->
wrk
->
vgz_rx
=
NULL
;
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
VGZ_UpdateObj
(
vg
,
sp
->
obj
);
VGZ_Destroy
(
&
vg
);
...
...
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