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
034abbfd
Commit
034abbfd
authored
Feb 21, 2020
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename REQ_BODY_FAIL to REQ_BODY_ERROR in preparation for merge with BS_*
parent
acd0cd4a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
cache_req_body.c
bin/varnishd/cache/cache_req_body.c
+7
-7
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+2
-2
cache_http1_fetch.c
bin/varnishd/http1/cache_http1_fetch.c
+1
-1
cache_http1_fsm.c
bin/varnishd/http1/cache_http1_fsm.c
+1
-1
req_body.h
include/tbl/req_body.h
+1
-1
No files found.
bin/varnishd/cache/cache_req_body.c
View file @
034abbfd
...
...
@@ -77,7 +77,7 @@ vrb_pull(struct req *req, ssize_t maxsize, objiterate_f *func, void *priv)
req
->
storage
=
NULL
;
if
(
STV_NewObject
(
req
->
wrk
,
req
->
body_oc
,
stv
,
8
)
==
0
)
{
req
->
req_body_status
=
REQ_BODY_
FAIL
;
req
->
req_body_status
=
REQ_BODY_
ERROR
;
HSH_DerefBoc
(
req
->
wrk
,
req
->
body_oc
);
AZ
(
HSH_DerefObjCore
(
req
->
wrk
,
&
req
->
body_oc
,
0
));
(
void
)
VFP_Error
(
vfc
,
"Object allocation failed:"
...
...
@@ -88,7 +88,7 @@ vrb_pull(struct req *req, ssize_t maxsize, objiterate_f *func, void *priv)
vfc
->
oc
=
req
->
body_oc
;
if
(
VFP_Open
(
vfc
)
<
0
)
{
req
->
req_body_status
=
REQ_BODY_
FAIL
;
req
->
req_body_status
=
REQ_BODY_
ERROR
;
HSH_DerefBoc
(
req
->
wrk
,
req
->
body_oc
);
AZ
(
HSH_DerefObjCore
(
req
->
wrk
,
&
req
->
body_oc
,
0
));
return
(
-
1
);
...
...
@@ -136,7 +136,7 @@ vrb_pull(struct req *req, ssize_t maxsize, objiterate_f *func, void *priv)
HSH_DerefBoc
(
req
->
wrk
,
req
->
body_oc
);
AZ
(
HSH_DerefObjCore
(
req
->
wrk
,
&
req
->
body_oc
,
0
));
if
(
vfps
!=
VFP_END
)
{
req
->
req_body_status
=
REQ_BODY_
FAIL
;
req
->
req_body_status
=
REQ_BODY_
ERROR
;
if
(
r
==
0
)
r
=
-
1
;
}
...
...
@@ -148,7 +148,7 @@ vrb_pull(struct req *req, ssize_t maxsize, objiterate_f *func, void *priv)
HSH_DerefBoc
(
req
->
wrk
,
req
->
body_oc
);
if
(
vfps
!=
VFP_END
)
{
req
->
req_body_status
=
REQ_BODY_
FAIL
;
req
->
req_body_status
=
REQ_BODY_
ERROR
;
AZ
(
HSH_DerefObjCore
(
req
->
wrk
,
&
req
->
body_oc
,
0
));
return
(
-
1
);
}
...
...
@@ -204,7 +204,7 @@ VRB_Iterate(struct worker *wrk, struct vsl_log *vsl,
VSLb
(
vsl
,
SLT_VCL_Error
,
"Uncached req.body can only be consumed once."
);
return
(
-
1
);
case
REQ_BODY_
FAIL
:
case
REQ_BODY_
ERROR
:
VSLb
(
vsl
,
SLT_FetchError
,
"Had failed reading req.body before."
);
return
(
-
1
);
...
...
@@ -307,7 +307,7 @@ VRB_Cache(struct req *req, ssize_t maxsize)
case
REQ_BODY_CACHED
:
AZ
(
ObjGetU64
(
req
->
wrk
,
req
->
body_oc
,
OA_LEN
,
&
u
));
return
(
u
);
case
REQ_BODY_
FAIL
:
case
REQ_BODY_
ERROR
:
return
(
-
1
);
case
REQ_BODY_NONE
:
return
(
0
);
...
...
@@ -319,7 +319,7 @@ VRB_Cache(struct req *req, ssize_t maxsize)
}
if
(
req
->
htc
->
content_length
>
maxsize
)
{
req
->
req_body_status
=
REQ_BODY_
FAIL
;
req
->
req_body_status
=
REQ_BODY_
ERROR
;
(
void
)
VFP_Error
(
req
->
vfc
,
"Request body too big to cache"
);
return
(
-
1
);
}
...
...
bin/varnishd/cache/cache_req_fsm.c
View file @
034abbfd
...
...
@@ -877,7 +877,7 @@ cnt_recv(struct worker *wrk, struct req *req)
cnt_recv_prep
(
req
,
ci
);
if
(
req
->
req_body_status
==
REQ_BODY_
FAIL
)
{
if
(
req
->
req_body_status
==
REQ_BODY_
ERROR
)
{
req
->
doclose
=
SC_OVERLOAD
;
return
(
REQ_FSM_DONE
);
}
...
...
@@ -899,7 +899,7 @@ cnt_recv(struct worker *wrk, struct req *req)
}
/* Attempts to cache req.body may fail */
if
(
req
->
req_body_status
==
REQ_BODY_
FAIL
)
{
if
(
req
->
req_body_status
==
REQ_BODY_
ERROR
)
{
req
->
doclose
=
SC_RX_BODY
;
return
(
REQ_FSM_DONE
);
}
...
...
bin/varnishd/http1/cache_http1_fetch.c
View file @
034abbfd
...
...
@@ -120,7 +120,7 @@ V1F_SendReq(struct worker *wrk, struct busyobj *bo, uint64_t *ctr_hdrbytes,
if
(
bo
->
req
->
req_body_status
!=
REQ_BODY_CACHED
)
bo
->
no_retry
=
"req.body not cached"
;
if
(
bo
->
req
->
req_body_status
==
REQ_BODY_
FAIL
)
{
if
(
bo
->
req
->
req_body_status
==
REQ_BODY_
ERROR
)
{
/*
* XXX: (#2332) We should test to see if the backend
* XXX: sent us some headers explaining why.
...
...
bin/varnishd/http1/cache_http1_fsm.c
View file @
034abbfd
...
...
@@ -153,7 +153,7 @@ http1_req_body(struct req *req)
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
if
(
req
->
htc
->
body_status
->
avail
&&
V1F_Setup_Fetch
(
req
->
vfc
,
req
->
htc
)
!=
0
)
req
->
req_body_status
=
REQ_BODY_
FAIL
;
req
->
req_body_status
=
REQ_BODY_
ERROR
;
}
static
void
...
...
include/tbl/req_body.h
View file @
034abbfd
...
...
@@ -37,7 +37,7 @@ REQ_BODY(WITH_LEN)
/* states >= TAKEN imply that no body is to be read */
REQ_BODY
(
TAKEN
)
REQ_BODY
(
CACHED
)
REQ_BODY
(
FAIL
)
REQ_BODY
(
ERROR
)
REQ_BODY
(
NONE
)
#undef REQ_BODY
...
...
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