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
b4a959ac
Commit
b4a959ac
authored
Feb 25, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make a hole through H2 POST.
parent
987d090a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
107 additions
and
2 deletions
+107
-2
cache_http2.h
bin/varnishd/http2/cache_http2.h
+3
-0
cache_http2_proto.c
bin/varnishd/http2/cache_http2_proto.c
+80
-2
t02005.vtc
bin/varnishtest/tests/t02005.vtc
+24
-0
No files found.
bin/varnishd/http2/cache_http2.h
View file @
b4a959ac
...
@@ -91,6 +91,9 @@ struct h2_sess {
...
@@ -91,6 +91,9 @@ struct h2_sess {
unsigned
magic
;
unsigned
magic
;
#define H2_SESS_MAGIC 0xa16f7e4b
#define H2_SESS_MAGIC 0xa16f7e4b
struct
h2_req
*
mailcall
;
pthread_cond_t
*
cond
;
struct
sess
*
sess
;
struct
sess
*
sess
;
int
refcnt
;
int
refcnt
;
uint32_t
highest_stream
;
uint32_t
highest_stream
;
...
...
bin/varnishd/http2/cache_http2_proto.c
View file @
b4a959ac
...
@@ -34,6 +34,7 @@
...
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <stdio.h>
#include "cache/cache_transport.h"
#include "cache/cache_transport.h"
#include "cache/cache_filter.h"
#include "http2/cache_http2.h"
#include "http2/cache_http2.h"
#include "vend.h"
#include "vend.h"
...
@@ -109,7 +110,6 @@ static const uint8_t H2_settings[] = {
...
@@ -109,7 +110,6 @@ static const uint8_t H2_settings[] = {
__match_proto__(h2_frame_f) \
__match_proto__(h2_frame_f) \
{ (void)wrk; (void)r2; VSLb(h2->vsl, SLT_Debug, "XXX implement " #l); INCOMPL(); }
{ (void)wrk; (void)r2; VSLb(h2->vsl, SLT_Debug, "XXX implement " #l); INCOMPL(); }
DUMMY_FRAME
(
data
)
DUMMY_FRAME
(
rst_stream
)
DUMMY_FRAME
(
rst_stream
)
DUMMY_FRAME
(
push_promise
)
DUMMY_FRAME
(
push_promise
)
DUMMY_FRAME
(
continuation
)
DUMMY_FRAME
(
continuation
)
...
@@ -471,7 +471,10 @@ h2_rx_headers(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
...
@@ -471,7 +471,10 @@ h2_rx_headers(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
VSLb_ts_req
(
req
,
"Req"
,
req
->
t_req
);
VSLb_ts_req
(
req
,
"Req"
,
req
->
t_req
);
http_SetH
(
req
->
http
,
HTTP_HDR_PROTO
,
"HTTP/2.0"
);
http_SetH
(
req
->
http
,
HTTP_HDR_PROTO
,
"HTTP/2.0"
);
if
(
h2
->
rxf_flags
&
H2FF_HEADERS_END_STREAM
)
req
->
req_body_status
=
REQ_BODY_NONE
;
req
->
req_body_status
=
REQ_BODY_NONE
;
else
req
->
req_body_status
=
REQ_BODY_WITHOUT_LEN
;
wrk
->
stats
->
client_req
++
;
wrk
->
stats
->
client_req
++
;
wrk
->
stats
->
s_req
++
;
wrk
->
stats
->
s_req
++
;
req
->
ws_req
=
WS_Snapshot
(
req
->
ws
);
req
->
ws_req
=
WS_Snapshot
(
req
->
ws
);
...
@@ -485,6 +488,78 @@ h2_rx_headers(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
...
@@ -485,6 +488,78 @@ h2_rx_headers(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
/**********************************************************************/
/**********************************************************************/
h2_error
__match_proto__
(
h2_frame_f
)
h2_rx_data
(
struct
worker
*
wrk
,
struct
h2_sess
*
h2
,
struct
h2_req
*
r2
)
{
(
void
)
wrk
;
Lck_AssertHeld
(
&
h2
->
sess
->
mtx
);
AZ
(
h2
->
mailcall
);
h2
->
mailcall
=
r2
;
AZ
(
pthread_cond_broadcast
(
h2
->
cond
));
while
(
h2
->
mailcall
!=
NULL
)
AZ
(
Lck_CondWait
(
h2
->
cond
,
&
h2
->
sess
->
mtx
,
0
));
return
(
0
);
}
static
enum
vfp_status
__match_proto__
(
vfp_pull_f
)
h2_vfp_body
(
struct
vfp_ctx
*
vc
,
struct
vfp_entry
*
vfe
,
void
*
ptr
,
ssize_t
*
lp
)
{
struct
h2_req
*
r2
;
struct
h2_sess
*
h2
;
unsigned
l
;
enum
vfp_status
retval
=
VFP_OK
;
CHECK_OBJ_NOTNULL
(
vc
,
VFP_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
vfe
,
VFP_ENTRY_MAGIC
);
CAST_OBJ_NOTNULL
(
r2
,
vfe
->
priv1
,
H2_REQ_MAGIC
);
h2
=
r2
->
h2sess
;
AN
(
ptr
);
AN
(
lp
);
l
=
*
lp
;
*
lp
=
0
;
Lck_Lock
(
&
h2
->
sess
->
mtx
);
while
(
h2
->
mailcall
!=
r2
)
AZ
(
Lck_CondWait
(
h2
->
cond
,
&
h2
->
sess
->
mtx
,
0
));
if
(
l
>
h2
->
rxf_len
)
l
=
h2
->
rxf_len
;
if
(
l
>
0
)
{
memcpy
(
ptr
,
h2
->
rxf_data
,
l
);
h2
->
rxf_data
+=
l
;
h2
->
rxf_len
-=
l
;
}
*
lp
=
l
;
if
(
h2
->
rxf_len
==
0
)
{
if
(
h2
->
rxf_flags
&
H2FF_DATA_END_STREAM
)
retval
=
VFP_END
;
h2
->
mailcall
=
NULL
;
AZ
(
pthread_cond_broadcast
(
h2
->
cond
));
}
Lck_Unlock
(
&
h2
->
sess
->
mtx
);
return
(
retval
);
}
static
const
struct
vfp
h2_body
=
{
.
name
=
"H2_BODY"
,
.
pull
=
h2_vfp_body
,
};
static
void
__match_proto__
(
vtr_req_body_t
)
h2_req_body
(
struct
req
*
req
)
{
struct
h2_req
*
r2
;
struct
vfp_entry
*
vfe
;
CHECK_OBJ
(
req
,
REQ_MAGIC
);
CAST_OBJ_NOTNULL
(
r2
,
req
->
transport_priv
,
H2_REQ_MAGIC
);
vfe
=
VFP_Push
(
req
->
vfc
,
&
h2_body
,
0
);
AN
(
vfe
);
vfe
->
priv1
=
r2
;
}
/**********************************************************************/
enum
htc_status_e
__match_proto__
(
htc_complete_f
)
enum
htc_status_e
__match_proto__
(
htc_complete_f
)
H2_prism_complete
(
struct
http_conn
*
htc
)
H2_prism_complete
(
struct
http_conn
*
htc
)
{
{
...
@@ -820,6 +895,7 @@ h2_new_session(struct worker *wrk, void *arg)
...
@@ -820,6 +895,7 @@ h2_new_session(struct worker *wrk, void *arg)
H2_FRAME_SETTINGS
,
H2FF_NONE
,
sizeof
H2_settings
,
0
,
H2_settings
);
H2_FRAME_SETTINGS
,
H2FF_NONE
,
sizeof
H2_settings
,
0
,
H2_settings
);
/* and off we go... */
/* and off we go... */
h2
->
cond
=
&
wrk
->
cond
;
Lck_Unlock
(
&
h2
->
sess
->
mtx
);
Lck_Unlock
(
&
h2
->
sess
->
mtx
);
while
(
h2_rxframe
(
wrk
,
h2
))
{
while
(
h2_rxframe
(
wrk
,
h2
))
{
...
@@ -832,6 +908,7 @@ h2_new_session(struct worker *wrk, void *arg)
...
@@ -832,6 +908,7 @@ h2_new_session(struct worker *wrk, void *arg)
if
(
r2
->
state
==
H2_S_IDLE
)
if
(
r2
->
state
==
H2_S_IDLE
)
h2_del_req
(
wrk
,
r2
);
h2_del_req
(
wrk
,
r2
);
}
}
h2
->
cond
=
NULL
;
}
}
struct
transport
H2_transport
=
{
struct
transport
H2_transport
=
{
...
@@ -840,5 +917,6 @@ struct transport H2_transport = {
...
@@ -840,5 +917,6 @@ struct transport H2_transport = {
.
new_session
=
h2_new_session
,
.
new_session
=
h2_new_session
,
.
sess_panic
=
h2_sess_panic
,
.
sess_panic
=
h2_sess_panic
,
.
deliver
=
h2_deliver
,
.
deliver
=
h2_deliver
,
.
req_body
=
h2_req_body
,
.
minimal_response
=
h2_minimal_response
,
.
minimal_response
=
h2_minimal_response
,
};
};
bin/varnishtest/tests/t02005.vtc
0 → 100644
View file @
b4a959ac
varnishtest "H2 POST"
server s1 {
rxreq
txresp -hdr "Content-Type: text/plain" -body response
} -start
varnish v1 -vcl+backend {} -cliok "param.set feature +http2" -start
varnish v1 -cliok "param.set debug +syncvsl"
client c1 {
stream 1 {
txreq -req POST -hdr content-type text/plain -hdr content-length 7 -body request
# First, HTTP checks
rxresp
expect resp.http.content-Type == "text/plain"
# Then, payload checks
write_body resp.txt
shell {grep -q response resp.txt}
} -run
} -run
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