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
192e6d06
Commit
192e6d06
authored
Sep 12, 2011
by
Poul-Henning Kamp
Committed by
Tollef Fog Heen
Sep 22, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit the actual fix for #1014 and not just the test-case.
Fixes #1014
parent
b6fcb3de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
cache_fetch.c
bin/varnishd/cache_fetch.c
+3
-8
cache_gzip.c
bin/varnishd/cache_gzip.c
+1
-0
No files found.
bin/varnishd/cache_fetch.c
View file @
192e6d06
...
...
@@ -202,20 +202,15 @@ fetch_straight(struct sess *sp, struct http_conn *htc, const char *b)
ssize_t
cl
;
assert
(
sp
->
wrk
->
body_status
==
BS_LENGTH
);
cl
=
fetch_number
(
b
,
10
);
sp
->
wrk
->
vfp
->
begin
(
sp
,
cl
>
0
?
cl
:
0
);
if
(
cl
<
0
)
{
WSP
(
sp
,
SLT_FetchError
,
"straight length field bogus"
);
return
(
-
1
);
}
/*
* XXX: we shouldn't need this if we have cl==0
* XXX: but we must also conditionalize the vfp->end()
*/
sp
->
wrk
->
vfp
->
begin
(
sp
,
cl
);
if
(
cl
==
0
)
}
else
if
(
cl
==
0
)
return
(
0
);
i
=
sp
->
wrk
->
vfp
->
bytes
(
sp
,
htc
,
cl
);
if
(
i
<=
0
)
{
WSP
(
sp
,
SLT_FetchError
,
"straight read_error: %d %d (%s)"
,
...
...
bin/varnishd/cache_gzip.c
View file @
192e6d06
...
...
@@ -600,6 +600,7 @@ vfp_testgzip_begin(struct sess *sp, size_t estimate)
{
(
void
)
estimate
;
sp
->
wrk
->
vgz_rx
=
VGZ_NewUngzip
(
sp
,
"u F -"
);
CHECK_OBJ_NOTNULL
(
sp
->
wrk
->
vgz_rx
,
VGZ_MAGIC
);
}
static
int
__match_proto__
()
...
...
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