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
b6be5d0f
Commit
b6be5d0f
authored
Feb 17, 2016
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Error handling for V1F_Setup_Fetch
parent
d3a647c5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
11 deletions
+27
-11
cache_backend.c
bin/varnishd/cache/cache_backend.c
+1
-2
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+8
-2
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+7
-1
cache_http1.h
bin/varnishd/http1/cache_http1.h
+1
-1
cache_http1_fsm.c
bin/varnishd/http1/cache_http1_fsm.c
+2
-1
cache_http1_vfp.c
bin/varnishd/http1/cache_http1_vfp.c
+8
-4
No files found.
bin/varnishd/cache/cache_backend.c
View file @
b6be5d0f
...
...
@@ -247,8 +247,7 @@ vbe_dir_getbody(const struct director *d, struct worker *wrk,
CHECK_OBJ_NOTNULL
(
bo
->
vfc
,
VFP_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
->
htc
,
HTTP_CONN_MAGIC
);
V1F_Setup_Fetch
(
bo
->
vfc
,
bo
->
htc
);
return
(
0
);
return
(
V1F_Setup_Fetch
(
bo
->
vfc
,
bo
->
htc
));
}
static
const
struct
suckaddr
*
__match_proto__
(
vdi_getip_f
)
...
...
bin/varnishd/cache/cache_fetch.c
View file @
b6be5d0f
...
...
@@ -655,8 +655,14 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
http_GetHdr
(
bo
->
beresp
,
H_ETag
,
&
p
)))
ObjSetFlag
(
bo
->
wrk
,
bo
->
fetch_objcore
,
OF_IMSCAND
,
1
);
if
(
bo
->
htc
->
body_status
!=
BS_NONE
)
AZ
(
VDI_GetBody
(
bo
->
wrk
,
bo
));
if
(
bo
->
htc
->
body_status
!=
BS_NONE
&&
VDI_GetBody
(
bo
->
wrk
,
bo
)
!=
0
)
{
(
void
)
VFP_Error
(
bo
->
vfc
,
"GetBody failed - workspace_backend overflow?"
);
bo
->
htc
->
doclose
=
SC_OVERLOAD
;
VDI_Finish
(
bo
->
wrk
,
bo
);
return
(
F_STP_ERROR
);
}
assert
(
bo
->
fetch_objcore
->
boc
->
refcount
>=
1
);
...
...
bin/varnishd/cache/cache_req_fsm.c
View file @
b6be5d0f
...
...
@@ -688,9 +688,15 @@ cnt_recv(struct worker *wrk, struct req *req)
VFP_Setup
(
req
->
htc
->
vfc
);
req
->
htc
->
vfc
->
http
=
req
->
http
;
req
->
htc
->
vfc
->
wrk
=
wrk
;
if
(
req
->
transport
->
req_body
!=
NULL
)
if
(
req
->
transport
->
req_body
!=
NULL
)
{
req
->
transport
->
req_body
(
req
);
if
(
req
->
req_body_status
==
REQ_BODY_FAIL
)
{
req
->
doclose
=
SC_OVERLOAD
;
return
(
REQ_FSM_DONE
);
}
}
VCL_recv_method
(
req
->
vcl
,
wrk
,
req
,
NULL
,
NULL
);
/* Attempts to cache req.body may fail */
...
...
bin/varnishd/http1/cache_http1.h
View file @
b6be5d0f
...
...
@@ -31,7 +31,7 @@
int
V1F_SendReq
(
struct
worker
*
,
struct
busyobj
*
,
uint64_t
*
ctr
,
int
onlycached
);
int
V1F_FetchRespHdr
(
struct
busyobj
*
);
void
V1F_Setup_Fetch
(
struct
vfp_ctx
*
vfc
,
struct
http_conn
*
htc
);
int
V1F_Setup_Fetch
(
struct
vfp_ctx
*
vfc
,
struct
http_conn
*
htc
);
/* cache_http1_fsm.c [HTTP1] */
void
HTTP1_Session
(
struct
worker
*
,
struct
req
*
);
...
...
bin/varnishd/http1/cache_http1_fsm.c
View file @
b6be5d0f
...
...
@@ -146,7 +146,8 @@ http1_req_body(struct req *req)
case
BS_EOF
:
case
BS_LENGTH
:
case
BS_CHUNKED
:
V1F_Setup_Fetch
(
req
->
htc
->
vfc
,
req
->
htc
);
if
(
V1F_Setup_Fetch
(
req
->
htc
->
vfc
,
req
->
htc
)
!=
0
)
req
->
req_body_status
=
REQ_BODY_FAIL
;
break
;
default:
break
;
...
...
bin/varnishd/http1/cache_http1_vfp.c
View file @
b6be5d0f
...
...
@@ -260,7 +260,7 @@ static const struct vfp v1f_eof = {
/*--------------------------------------------------------------------
*/
void
int
V1F_Setup_Fetch
(
struct
vfp_ctx
*
vfc
,
struct
http_conn
*
htc
)
{
struct
vfp_entry
*
vfe
;
...
...
@@ -272,19 +272,22 @@ V1F_Setup_Fetch(struct vfp_ctx *vfc, struct http_conn *htc)
case
BS_EOF
:
assert
(
htc
->
content_length
==
-
1
);
vfe
=
VFP_Push
(
vfc
,
&
v1f_eof
,
0
);
XXXAN
(
vfe
);
if
(
vfe
==
NULL
)
return
(
ENOSPC
);
vfe
->
priv2
=
0
;
break
;
case
BS_LENGTH
:
assert
(
htc
->
content_length
>
0
);
vfe
=
VFP_Push
(
vfc
,
&
v1f_straight
,
0
);
XXXAN
(
vfe
);
if
(
vfe
==
NULL
)
return
(
ENOSPC
);
vfe
->
priv2
=
htc
->
content_length
;
break
;
case
BS_CHUNKED
:
assert
(
htc
->
content_length
==
-
1
);
vfe
=
VFP_Push
(
vfc
,
&
v1f_chunked
,
0
);
XXXAN
(
vfe
);
if
(
vfe
==
NULL
)
return
(
ENOSPC
);
vfe
->
priv2
=
-
1
;
break
;
default:
...
...
@@ -292,4 +295,5 @@ V1F_Setup_Fetch(struct vfp_ctx *vfc, struct http_conn *htc)
break
;
}
vfe
->
priv1
=
htc
;
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