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
1c9dafad
Commit
1c9dafad
authored
Jan 21, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a problem with proper termination of object when it is gzip'ed
on reception
parent
35febe95
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
19 deletions
+35
-19
cache_gzip.c
bin/varnishd/cache_gzip.c
+35
-19
No files found.
bin/varnishd/cache_gzip.c
View file @
1c9dafad
...
@@ -422,7 +422,7 @@ vfp_gzip_bytes(struct sess *sp, struct http_conn *htc, size_t bytes)
...
@@ -422,7 +422,7 @@ vfp_gzip_bytes(struct sess *sp, struct http_conn *htc, size_t bytes)
vg
=
sp
->
wrk
->
vgz_rx
;
vg
=
sp
->
wrk
->
vgz_rx
;
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
AZ
(
vg
->
vz
.
avail_in
);
AZ
(
vg
->
vz
.
avail_in
);
while
(
bytes
>
0
||
vg
->
vz
.
avail_in
>
0
)
{
while
(
bytes
>
0
||
!
VGZ_IbufEmpty
(
vg
)
)
{
if
(
sp
->
wrk
->
storage
==
NULL
)
if
(
sp
->
wrk
->
storage
==
NULL
)
sp
->
wrk
->
storage
=
STV_alloc
(
sp
,
sp
->
wrk
->
storage
=
STV_alloc
(
sp
,
params
->
fetch_chunksize
*
1024LL
);
params
->
fetch_chunksize
*
1024LL
);
...
@@ -434,7 +434,7 @@ vfp_gzip_bytes(struct sess *sp, struct http_conn *htc, size_t bytes)
...
@@ -434,7 +434,7 @@ vfp_gzip_bytes(struct sess *sp, struct http_conn *htc, size_t bytes)
VGZ_Obuf
(
vg
,
st
->
ptr
+
st
->
len
,
st
->
space
-
st
->
len
);
VGZ_Obuf
(
vg
,
st
->
ptr
+
st
->
len
,
st
->
space
-
st
->
len
);
if
(
vg
->
vz
.
avail_in
==
0
&&
bytes
>
0
)
{
if
(
VGZ_IbufEmpty
(
vg
)
&&
bytes
>
0
)
{
l
=
sizeof
ibuf
;
l
=
sizeof
ibuf
;
if
(
l
>
bytes
)
if
(
l
>
bytes
)
l
=
bytes
;
l
=
bytes
;
...
@@ -445,20 +445,17 @@ vfp_gzip_bytes(struct sess *sp, struct http_conn *htc, size_t bytes)
...
@@ -445,20 +445,17 @@ vfp_gzip_bytes(struct sess *sp, struct http_conn *htc, size_t bytes)
bytes
-=
w
;
bytes
-=
w
;
}
}
i
=
VGZ_Gzip
(
vg
,
&
dp
,
&
dl
,
i
=
VGZ_Gzip
(
vg
,
&
dp
,
&
dl
,
VGZ_NORMAL
);
bytes
==
0
?
VGZ_FINISH
:
VGZ_NORMAL
);
assert
(
i
==
Z_OK
);
assert
(
i
==
Z_OK
||
i
==
Z_STREAM_END
)
;
st
->
len
+=
dl
;
s
t
->
len
=
st
->
space
-
dl
;
s
p
->
obj
->
len
+=
dl
;
if
(
st
->
len
==
st
->
space
)
{
if
(
st
->
len
==
st
->
space
)
{
VTAILQ_INSERT_TAIL
(
&
sp
->
obj
->
store
,
VTAILQ_INSERT_TAIL
(
&
sp
->
obj
->
store
,
sp
->
wrk
->
storage
,
list
);
sp
->
wrk
->
storage
,
list
);
sp
->
obj
->
len
+=
st
->
len
;
sp
->
wrk
->
storage
=
NULL
;
sp
->
wrk
->
storage
=
NULL
;
}
}
}
}
if
(
i
==
Z_STREAM_END
)
return
(
1
);
return
(
1
);
return
(
-
1
);
}
}
static
int
__match_proto__
()
static
int
__match_proto__
()
...
@@ -466,24 +463,43 @@ vfp_gzip_end(struct sess *sp)
...
@@ -466,24 +463,43 @@ vfp_gzip_end(struct sess *sp)
{
{
struct
vgz
*
vg
;
struct
vgz
*
vg
;
struct
storage
*
st
;
struct
storage
*
st
;
size_t
dl
;
const
void
*
dp
;
int
i
;
vg
=
sp
->
wrk
->
vgz_rx
;
vg
=
sp
->
wrk
->
vgz_rx
;
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
CHECK_OBJ_NOTNULL
(
vg
,
VGZ_MAGIC
);
do
{
if
(
sp
->
wrk
->
storage
==
NULL
)
sp
->
wrk
->
storage
=
STV_alloc
(
sp
,
params
->
fetch_chunksize
*
1024LL
);
if
(
sp
->
wrk
->
storage
==
NULL
)
{
errno
=
ENOMEM
;
return
(
-
1
);
}
st
=
sp
->
wrk
->
storage
;
VGZ_Ibuf
(
vg
,
""
,
0
);
VGZ_Obuf
(
vg
,
st
->
ptr
+
st
->
len
,
st
->
space
-
st
->
len
);
i
=
VGZ_Gzip
(
vg
,
&
dp
,
&
dl
,
VGZ_FINISH
);
st
->
len
+=
dl
;
sp
->
obj
->
len
+=
dl
;
if
(
st
->
len
==
st
->
space
)
{
VTAILQ_INSERT_TAIL
(
&
sp
->
obj
->
store
,
sp
->
wrk
->
storage
,
list
);
sp
->
wrk
->
storage
=
NULL
;
}
}
while
(
i
!=
Z_STREAM_END
);
VGZ_Destroy
(
&
vg
);
VGZ_Destroy
(
&
vg
);
st
=
sp
->
wrk
->
storage
;
st
=
sp
->
wrk
->
storage
;
sp
->
wrk
->
storage
=
NULL
;
sp
->
wrk
->
storage
=
NULL
;
if
(
st
==
NULL
)
if
(
st
!=
NULL
&&
st
->
len
==
0
)
{
return
(
0
);
if
(
st
->
len
==
0
)
{
STV_free
(
st
);
STV_free
(
st
);
return
(
0
);
}
else
if
(
st
!=
NULL
&&
st
->
len
<
st
->
space
)
{
}
if
(
st
->
len
<
st
->
space
)
STV_trim
(
st
,
st
->
len
);
STV_trim
(
st
,
st
->
len
);
sp
->
obj
->
len
+=
st
->
len
;
VTAILQ_INSERT_TAIL
(
&
sp
->
obj
->
store
,
st
,
list
)
;
VTAILQ_INSERT_TAIL
(
&
sp
->
obj
->
store
,
st
,
list
);
}
return
(
0
);
return
(
0
);
}
}
...
...
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