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
6405cc21
Commit
6405cc21
authored
Oct 12, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove VDP_push's "bottom" argument, we always build VDP stacks
from the top down.
parent
49e42d22
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
13 deletions
+10
-13
cache_deliver_proc.c
bin/varnishd/cache/cache_deliver_proc.c
+2
-5
cache_esi_deliver.c
bin/varnishd/cache/cache_esi_deliver.c
+2
-2
cache_filter.h
bin/varnishd/cache/cache_filter.h
+1
-1
cache_range.c
bin/varnishd/cache/cache_range.c
+1
-1
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+2
-2
cache_http1_deliver.c
bin/varnishd/http1/cache_http1_deliver.c
+1
-1
cache_http2_deliver.c
bin/varnishd/http2/cache_http2_deliver.c
+1
-1
No files found.
bin/varnishd/cache/cache_deliver_proc.c
View file @
6405cc21
...
@@ -74,7 +74,7 @@ VDP_bytes(struct req *req, enum vdp_action act, const void *ptr, ssize_t len)
...
@@ -74,7 +74,7 @@ VDP_bytes(struct req *req, enum vdp_action act, const void *ptr, ssize_t len)
}
}
int
int
VDP_
push
(
struct
req
*
req
,
const
struct
vdp
*
vdp
,
void
*
priv
,
int
bottom
)
VDP_
Push
(
struct
req
*
req
,
const
struct
vdp
*
vdp
,
void
*
priv
)
{
{
struct
vdp_entry
*
vdpe
;
struct
vdp_entry
*
vdpe
;
struct
vdp_ctx
*
vdc
;
struct
vdp_ctx
*
vdc
;
...
@@ -100,10 +100,7 @@ VDP_push(struct req *req, const struct vdp *vdp, void *priv, int bottom)
...
@@ -100,10 +100,7 @@ VDP_push(struct req *req, const struct vdp *vdp, void *priv, int bottom)
INIT_OBJ
(
vdpe
,
VDP_ENTRY_MAGIC
);
INIT_OBJ
(
vdpe
,
VDP_ENTRY_MAGIC
);
vdpe
->
vdp
=
vdp
;
vdpe
->
vdp
=
vdp
;
vdpe
->
priv
=
priv
;
vdpe
->
priv
=
priv
;
if
(
bottom
)
VTAILQ_INSERT_TAIL
(
&
vdc
->
vdp
,
vdpe
,
list
);
VTAILQ_INSERT_TAIL
(
&
vdc
->
vdp
,
vdpe
,
list
);
else
VTAILQ_INSERT_HEAD
(
&
vdc
->
vdp
,
vdpe
,
list
);
vdc
->
nxt
=
VTAILQ_FIRST
(
&
vdc
->
vdp
);
vdc
->
nxt
=
VTAILQ_FIRST
(
&
vdc
->
vdp
);
AZ
(
vdc
->
retval
);
AZ
(
vdc
->
retval
);
...
...
bin/varnishd/cache/cache_esi_deliver.c
View file @
6405cc21
...
@@ -833,9 +833,9 @@ ved_deliver(struct req *req, struct boc *boc, int wantbody)
...
@@ -833,9 +833,9 @@ ved_deliver(struct req *req, struct boc *boc, int wantbody)
ved_stripgzip
(
req
,
boc
);
ved_stripgzip
(
req
,
boc
);
}
else
{
}
else
{
if
(
ecx
->
isgzip
&&
!
i
)
if
(
ecx
->
isgzip
&&
!
i
)
(
void
)
VDP_
push
(
req
,
&
ved_vdp_pgz
,
ecx
,
1
);
(
void
)
VDP_
Push
(
req
,
&
ved_vdp_pgz
,
ecx
);
else
else
(
void
)
VDP_
push
(
req
,
&
ved_ved
,
ecx
->
preq
,
1
);
(
void
)
VDP_
Push
(
req
,
&
ved_ved
,
ecx
->
preq
);
(
void
)
VDP_DeliverObj
(
req
);
(
void
)
VDP_DeliverObj
(
req
);
(
void
)
VDP_bytes
(
req
,
VDP_FLUSH
,
NULL
,
0
);
(
void
)
VDP_bytes
(
req
,
VDP_FLUSH
,
NULL
,
0
);
}
}
...
...
bin/varnishd/cache/cache_filter.h
View file @
6405cc21
...
@@ -129,6 +129,6 @@ struct vdp_ctx {
...
@@ -129,6 +129,6 @@ struct vdp_ctx {
};
};
int
VDP_bytes
(
struct
req
*
,
enum
vdp_action
act
,
const
void
*
ptr
,
ssize_t
len
);
int
VDP_bytes
(
struct
req
*
,
enum
vdp_action
act
,
const
void
*
ptr
,
ssize_t
len
);
int
VDP_
push
(
struct
req
*
,
const
struct
vdp
*
,
void
*
priv
,
int
bottom
);
int
VDP_
Push
(
struct
req
*
,
const
struct
vdp
*
,
void
*
priv
);
void
VRT_AddVDP
(
VRT_CTX
,
const
struct
vdp
*
);
void
VRT_AddVDP
(
VRT_CTX
,
const
struct
vdp
*
);
void
VRT_RemoveVDP
(
VRT_CTX
,
const
struct
vdp
*
);
void
VRT_RemoveVDP
(
VRT_CTX
,
const
struct
vdp
*
);
bin/varnishd/cache/cache_range.c
View file @
6405cc21
...
@@ -181,7 +181,7 @@ vrg_dorange(struct req *req, const char *r)
...
@@ -181,7 +181,7 @@ vrg_dorange(struct req *req, const char *r)
vrg_priv
->
range_off
=
0
;
vrg_priv
->
range_off
=
0
;
vrg_priv
->
range_low
=
low
;
vrg_priv
->
range_low
=
low
;
vrg_priv
->
range_high
=
high
+
1
;
vrg_priv
->
range_high
=
high
+
1
;
if
(
VDP_
push
(
req
,
&
vrg_vdp
,
vrg_priv
,
1
))
if
(
VDP_
Push
(
req
,
&
vrg_vdp
,
vrg_priv
))
return
(
"WS too small"
);
return
(
"WS too small"
);
http_PutResponse
(
req
->
resp
,
"HTTP/1.1"
,
206
,
NULL
);
http_PutResponse
(
req
->
resp
,
"HTTP/1.1"
,
206
,
NULL
);
return
(
NULL
);
return
(
NULL
);
...
...
bin/varnishd/cache/cache_req_fsm.c
View file @
6405cc21
...
@@ -379,13 +379,13 @@ cnt_transmit(struct worker *wrk, struct req *req)
...
@@ -379,13 +379,13 @@ cnt_transmit(struct worker *wrk, struct req *req)
if
(
sendbody
>=
0
)
{
if
(
sendbody
>=
0
)
{
if
(
!
req
->
disable_esi
&&
req
->
resp_len
!=
0
&&
if
(
!
req
->
disable_esi
&&
req
->
resp_len
!=
0
&&
ObjHasAttr
(
wrk
,
req
->
objcore
,
OA_ESIDATA
)
&&
ObjHasAttr
(
wrk
,
req
->
objcore
,
OA_ESIDATA
)
&&
VDP_
push
(
req
,
&
VDP_esi
,
NULL
,
0
)
<
0
)
VDP_
Push
(
req
,
&
VDP_esi
,
NULL
)
<
0
)
err
++
;
err
++
;
if
(
cache_param
->
http_gzip_support
&&
if
(
cache_param
->
http_gzip_support
&&
ObjCheckFlag
(
req
->
wrk
,
req
->
objcore
,
OF_GZIPED
)
&&
ObjCheckFlag
(
req
->
wrk
,
req
->
objcore
,
OF_GZIPED
)
&&
!
RFC2616_Req_Gzip
(
req
->
http
)
&&
!
RFC2616_Req_Gzip
(
req
->
http
)
&&
VDP_
push
(
req
,
&
VDP_gunzip
,
NULL
,
1
)
<
0
)
VDP_
Push
(
req
,
&
VDP_gunzip
,
NULL
)
<
0
)
err
++
;
err
++
;
if
(
cache_param
->
http_range_support
&&
if
(
cache_param
->
http_range_support
&&
...
...
bin/varnishd/http1/cache_http1_deliver.c
View file @
6405cc21
...
@@ -126,7 +126,7 @@ V1D_Deliver(struct req *req, struct boc *boc, int sendbody)
...
@@ -126,7 +126,7 @@ V1D_Deliver(struct req *req, struct boc *boc, int sendbody)
if
(
req
->
resp_len
==
0
)
if
(
req
->
resp_len
==
0
)
sendbody
=
0
;
sendbody
=
0
;
if
(
sendbody
&&
VDP_
push
(
req
,
&
v1d_vdp
,
NULL
,
1
))
{
if
(
sendbody
&&
VDP_
Push
(
req
,
&
v1d_vdp
,
NULL
))
{
v1d_error
(
req
,
"workspace_thread overflow"
);
v1d_error
(
req
,
"workspace_thread overflow"
);
AZ
(
req
->
wrk
->
v1l
);
AZ
(
req
->
wrk
->
v1l
);
return
;
return
;
...
...
bin/varnishd/http2/cache_http2_deliver.c
View file @
6405cc21
...
@@ -301,7 +301,7 @@ h2_deliver(struct req *req, struct boc *boc, int sendbody)
...
@@ -301,7 +301,7 @@ h2_deliver(struct req *req, struct boc *boc, int sendbody)
/* XXX someone into H2 please add appropriate error handling */
/* XXX someone into H2 please add appropriate error handling */
if
(
sendbody
)
{
if
(
sendbody
)
{
if
(
!
VDP_
push
(
req
,
&
h2_vdp
,
NULL
,
1
))
if
(
!
VDP_
Push
(
req
,
&
h2_vdp
,
NULL
))
(
void
)
VDP_DeliverObj
(
req
);
(
void
)
VDP_DeliverObj
(
req
);
}
}
...
...
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