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
255a789d
Commit
255a789d
authored
Feb 21, 2020
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename REQ_BODY_WITH_LEN to REQ_BODY_LENGTH in preparation for merge with BS_*
parent
034abbfd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+1
-1
cache_req_body.c
bin/varnishd/cache/cache_req_body.c
+4
-4
cache_http1_fsm.c
bin/varnishd/http1/cache_http1_fsm.c
+1
-1
cache_http2_proto.c
bin/varnishd/http2/cache_http2_proto.c
+1
-1
req_body.h
include/tbl/req_body.h
+1
-1
No files found.
bin/varnishd/cache/cache_fetch.c
View file @
255a789d
...
...
@@ -249,7 +249,7 @@ vbf_stp_mkbereq(struct worker *wrk, struct busyobj *bo)
HSH_Ref
(
bo
->
bereq_body
);
bo
->
req
=
NULL
;
ObjSetState
(
bo
->
wrk
,
bo
->
fetch_objcore
,
BOS_REQ_DONE
);
}
else
if
(
bo
->
req
->
req_body_status
!=
REQ_BODY_
WITH_LEN
&&
}
else
if
(
bo
->
req
->
req_body_status
!=
REQ_BODY_
LENGTH
&&
bo
->
req
->
req_body_status
!=
REQ_BODY_WITHOUT_LEN
)
{
WRONG
(
"Bad req_body_status"
);
}
...
...
bin/varnishd/cache/cache_req_body.c
View file @
255a789d
...
...
@@ -197,7 +197,7 @@ VRB_Iterate(struct worker *wrk, struct vsl_log *vsl,
return
(
0
);
case
REQ_BODY_NONE
:
return
(
0
);
case
REQ_BODY_
WITH_LEN
:
case
REQ_BODY_
LENGTH
:
case
REQ_BODY_WITHOUT_LEN
:
break
;
case
REQ_BODY_TAKEN
:
...
...
@@ -212,7 +212,7 @@ VRB_Iterate(struct worker *wrk, struct vsl_log *vsl,
WRONG
(
"Wrong req_body_status in VRB_Iterate()"
);
}
Lck_Lock
(
&
req
->
sp
->
mtx
);
if
(
req
->
req_body_status
==
REQ_BODY_
WITH_LEN
||
if
(
req
->
req_body_status
==
REQ_BODY_
LENGTH
||
req
->
req_body_status
==
REQ_BODY_WITHOUT_LEN
)
{
req
->
req_body_status
=
REQ_BODY_TAKEN
;
i
=
0
;
...
...
@@ -254,7 +254,7 @@ VRB_Ignore(struct req *req)
if
(
req
->
doclose
)
return
(
0
);
if
(
req
->
req_body_status
==
REQ_BODY_
WITH_LEN
||
if
(
req
->
req_body_status
==
REQ_BODY_
LENGTH
||
req
->
req_body_status
==
REQ_BODY_WITHOUT_LEN
)
(
void
)
VRB_Iterate
(
req
->
wrk
,
req
->
vsl
,
req
,
httpq_req_body_discard
,
NULL
);
return
(
0
);
...
...
@@ -312,7 +312,7 @@ VRB_Cache(struct req *req, ssize_t maxsize)
case
REQ_BODY_NONE
:
return
(
0
);
case
REQ_BODY_WITHOUT_LEN
:
case
REQ_BODY_
WITH_LEN
:
case
REQ_BODY_
LENGTH
:
break
;
default:
WRONG
(
"Wrong req_body_status in VRB_Cache()"
);
...
...
bin/varnishd/http1/cache_http1_fsm.c
View file @
255a789d
...
...
@@ -278,7 +278,7 @@ http1_dissect(struct worker *wrk, struct req *req)
if
(
req
->
htc
->
body_status
==
BS_CHUNKED
)
req
->
req_body_status
=
REQ_BODY_WITHOUT_LEN
;
else
if
(
req
->
htc
->
body_status
==
BS_LENGTH
)
req
->
req_body_status
=
REQ_BODY_
WITH_LEN
;
req
->
req_body_status
=
REQ_BODY_
LENGTH
;
else
if
(
req
->
htc
->
body_status
==
BS_NONE
)
req
->
req_body_status
=
REQ_BODY_NONE
;
else
if
(
req
->
htc
->
body_status
==
BS_EOF
)
...
...
bin/varnishd/http2/cache_http2_proto.c
View file @
255a789d
...
...
@@ -583,7 +583,7 @@ h2_end_headers(struct worker *wrk, struct h2_sess *h2,
if
(
!
http_GetHdr
(
req
->
http
,
H_Content_Length
,
NULL
))
req
->
req_body_status
=
REQ_BODY_WITHOUT_LEN
;
else
req
->
req_body_status
=
REQ_BODY_
WITH_LEN
;
req
->
req_body_status
=
REQ_BODY_
LENGTH
;
}
else
{
assert
(
req
->
req_body_status
==
REQ_BODY_NONE
);
if
(
http_GetContentLength
(
req
->
http
)
>
0
)
...
...
include/tbl/req_body.h
View file @
255a789d
...
...
@@ -33,7 +33,7 @@
REQ_BODY
(
INIT
)
REQ_BODY
(
WITHOUT_LEN
)
REQ_BODY
(
WITH_LEN
)
REQ_BODY
(
LENGTH
)
/* states >= TAKEN imply that no body is to be read */
REQ_BODY
(
TAKEN
)
REQ_BODY
(
CACHED
)
...
...
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