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
a2f873f2
Commit
a2f873f2
authored
Oct 25, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Register buffer allocation failuers on vgz's and make failure
to clean those up non-fatal. Fixes #1036
parent
64600368
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
13 deletions
+43
-13
cache_gzip.c
bin/varnishd/cache_gzip.c
+21
-13
r01036.vtc
bin/varnishtest/tests/r01036.vtc
+22
-0
No files found.
bin/varnishd/cache_gzip.c
View file @
a2f873f2
...
@@ -83,6 +83,7 @@ struct vgz {
...
@@ -83,6 +83,7 @@ struct vgz {
const
char
*
id
;
const
char
*
id
;
struct
ws
*
tmp
;
struct
ws
*
tmp
;
char
*
tmp_snapshot
;
char
*
tmp_snapshot
;
const
char
*
error
;
struct
storage
*
obuf
;
struct
storage
*
obuf
;
...
@@ -261,8 +262,10 @@ VGZ_ObufStorage(struct worker *w, struct vgz *vg)
...
@@ -261,8 +262,10 @@ VGZ_ObufStorage(struct worker *w, struct vgz *vg)
struct
storage
*
st
;
struct
storage
*
st
;
st
=
FetchStorage
(
w
,
0
);
st
=
FetchStorage
(
w
,
0
);
if
(
st
==
NULL
)
if
(
st
==
NULL
)
{
vg
->
error
=
"Could not get ObufStorage"
;
return
(
-
1
);
return
(
-
1
);
}
vg
->
obuf
=
st
;
vg
->
obuf
=
st
;
VGZ_Obuf
(
vg
,
st
->
ptr
+
st
->
len
,
st
->
space
-
st
->
len
);
VGZ_Obuf
(
vg
,
st
->
ptr
+
st
->
len
,
st
->
space
-
st
->
len
);
...
@@ -407,6 +410,7 @@ void
...
@@ -407,6 +410,7 @@ void
VGZ_Destroy
(
struct
vgz
**
vgp
)
VGZ_Destroy
(
struct
vgz
**
vgp
)
{
{
struct
vgz
*
vg
;
struct
vgz
*
vg
;
const
char
*
err
;
vg
=
*
vgp
;
vg
=
*
vgp
;
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
...
@@ -419,12 +423,13 @@ VGZ_Destroy(struct vgz **vgp)
...
@@ -419,12 +423,13 @@ VGZ_Destroy(struct vgz **vgp)
(
intmax_t
)
vg
->
vz
.
start_bit
,
(
intmax_t
)
vg
->
vz
.
start_bit
,
(
intmax_t
)
vg
->
vz
.
last_bit
,
(
intmax_t
)
vg
->
vz
.
last_bit
,
(
intmax_t
)
vg
->
vz
.
stop_bit
);
(
intmax_t
)
vg
->
vz
.
stop_bit
);
err
=
vg
->
error
;
if
(
vg
->
tmp
!=
NULL
)
if
(
vg
->
tmp
!=
NULL
)
WS_Reset
(
vg
->
tmp
,
vg
->
tmp_snapshot
);
WS_Reset
(
vg
->
tmp
,
vg
->
tmp_snapshot
);
if
(
vg
->
dir
==
VGZ_GZ
)
if
(
vg
->
dir
==
VGZ_GZ
)
AZ
(
deflateEnd
(
&
vg
->
vz
)
);
assert
(
deflateEnd
(
&
vg
->
vz
)
==
0
||
err
!=
NULL
);
else
else
AZ
(
inflateEnd
(
&
vg
->
vz
)
);
assert
(
inflateEnd
(
&
vg
->
vz
)
==
0
||
err
!=
NULL
);
FREE_OBJ
(
vg
);
FREE_OBJ
(
vg
);
}
}
...
@@ -564,18 +569,20 @@ vfp_gzip_end(struct worker *w)
...
@@ -564,18 +569,20 @@ vfp_gzip_end(struct worker *w)
int
i
;
int
i
;
vg
=
w
->
vgz_rx
;
vg
=
w
->
vgz_rx
;
w
->
vgz_rx
=
NULL
;
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
do
{
w
->
vgz_rx
=
NULL
;
VGZ_Ibuf
(
vg
,
""
,
0
);
if
(
vg
->
error
==
NULL
)
{
if
(
VGZ_ObufStorage
(
w
,
vg
))
do
{
return
(
-
1
);
VGZ_Ibuf
(
vg
,
""
,
0
);
i
=
VGZ_Gzip
(
vg
,
&
dp
,
&
dl
,
VGZ_FINISH
);
if
(
VGZ_ObufStorage
(
w
,
vg
))
return
(
-
1
);
i
=
VGZ_Gzip
(
vg
,
&
dp
,
&
dl
,
VGZ_FINISH
);
w
->
fetch_obj
->
len
+=
dl
;
w
->
fetch_obj
->
len
+=
dl
;
}
while
(
i
!=
Z_STREAM_END
);
}
while
(
i
!=
Z_STREAM_END
);
if
(
w
->
do_stream
)
if
(
w
->
do_stream
)
RES_StreamPoll
(
w
);
RES_StreamPoll
(
w
);
VGZ_UpdateObj
(
vg
,
w
->
fetch_obj
);
VGZ_UpdateObj
(
vg
,
w
->
fetch_obj
);
}
VGZ_Destroy
(
&
vg
);
VGZ_Destroy
(
&
vg
);
return
(
0
);
return
(
0
);
}
}
...
@@ -619,6 +626,7 @@ vfp_testgzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
...
@@ -619,6 +626,7 @@ vfp_testgzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
st
=
FetchStorage
(
w
,
0
);
st
=
FetchStorage
(
w
,
0
);
if
(
st
==
NULL
)
{
if
(
st
==
NULL
)
{
htc
->
error
=
"Could not get storage"
;
htc
->
error
=
"Could not get storage"
;
vg
->
error
=
htc
->
error
;
return
(
-
1
);
return
(
-
1
);
}
}
l
=
st
->
space
-
st
->
len
;
l
=
st
->
space
-
st
->
len
;
...
...
bin/varnishtest/tests/r01036.vtc
0 → 100644
View file @
a2f873f2
varnishtest "Test case for #1036"
server s1 {
rxreq
# Send a bodylen of 1,5M, which will exceed cache space of 1M
non-fatal
txresp -bodylen 1572864
} -start
varnish v1 -arg "-smalloc,1M" -arg "-pgzip_level=0" -vcl+backend {
sub vcl_fetch {
set beresp.do_gzip = true;
}
} -start
client c1 {
txreq
rxresp
expect resp.status == "503"
} -run
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