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
d9698da2
Commit
d9698da2
authored
Mar 08, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Streamline the H1->H2 handover a bit
parent
409114f5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
36 deletions
+36
-36
cache_transport.h
bin/varnishd/cache/cache_transport.h
+2
-0
cache_http1_fsm.c
bin/varnishd/http1/cache_http1_fsm.c
+2
-8
cache_http2_session.c
bin/varnishd/http2/cache_http2_session.c
+32
-28
No files found.
bin/varnishd/cache/cache_transport.h
View file @
d9698da2
...
...
@@ -70,6 +70,8 @@ extern struct transport PROXY_transport;
extern
struct
transport
HTTP1_transport
;
extern
struct
transport
H2_transport
;
htc_complete_f
H2_prism_complete
;
void
H2_PU_Sess
(
struct
worker
*
,
struct
sess
*
,
struct
req
*
);
void
H2_OU_Sess
(
struct
worker
*
,
struct
sess
*
,
struct
req
*
);
const
struct
transport
*
XPORT_ByNumber
(
uint16_t
no
);
void
VPX_Send_Proxy
(
int
fd
,
int
version
,
const
struct
sess
*
);
bin/varnishd/http1/cache_http1_fsm.c
View file @
d9698da2
...
...
@@ -408,11 +408,8 @@ HTTP1_Session(struct worker *wrk, struct req *req)
http1_setstate
(
sp
,
H1CLEANUP
);
continue
;
}
VSLb
(
req
->
vsl
,
SLT_Debug
,
"H2 Prior Knowledge Upgrade"
);
http1_setstate
(
sp
,
NULL
);
req
->
err_code
=
1
;
SES_SetTransport
(
wrk
,
sp
,
req
,
&
H2_transport
);
H2_PU_Sess
(
wrk
,
sp
,
req
);
return
;
}
...
...
@@ -433,12 +430,9 @@ HTTP1_Session(struct worker *wrk, struct req *req)
VSLb
(
req
->
vsl
,
SLT_Debug
,
"H2 upgrade attempt has body"
);
}
else
{
VSLb
(
req
->
vsl
,
SLT_Debug
,
"H2 Upgrade"
);
http1_setstate
(
sp
,
NULL
);
req
->
err_code
=
2
;
SES_SetTransport
(
wrk
,
sp
,
req
,
&
H2_transport
);
H2_OU_Sess
(
wrk
,
sp
,
req
);
return
;
}
}
...
...
bin/varnishd/http2/cache_http2_session.c
View file @
d9698da2
...
...
@@ -288,6 +288,28 @@ h2_new_ou_session(struct worker *wrk, struct h2_sess *h2,
return
(
1
);
}
/**********************************************************************
*/
#define H2_PU_MARKER 1
#define H2_OU_MARKER 2
void
H2_PU_Sess
(
struct
worker
*
wrk
,
struct
sess
*
sp
,
struct
req
*
req
)
{
VSLb
(
req
->
vsl
,
SLT_Debug
,
"H2 Prior Knowledge Upgrade"
);
req
->
err_code
=
H2_PU_MARKER
;
SES_SetTransport
(
wrk
,
sp
,
req
,
&
H2_transport
);
}
void
H2_OU_Sess
(
struct
worker
*
wrk
,
struct
sess
*
sp
,
struct
req
*
req
)
{
VSLb
(
req
->
vsl
,
SLT_Debug
,
"H2 Optimistic Upgrade"
);
req
->
err_code
=
H2_OU_MARKER
;
SES_SetTransport
(
wrk
,
sp
,
req
,
&
H2_transport
);
}
static
void
__match_proto__
(
task_func_t
)
h2_new_session
(
struct
worker
*
wrk
,
void
*
arg
)
{
...
...
@@ -304,35 +326,17 @@ h2_new_session(struct worker *wrk, void *arg)
assert
(
req
->
transport
==
&
H2_transport
);
assert
(
req
->
err_code
==
H2_PU_MARKER
||
req
->
err_code
==
H2_OU_MARKER
);
switch
(
req
->
err_code
)
{
case
0
:
/* Direct H2 connection (via Proxy) */
h2
=
h2_new_sess
(
wrk
,
sp
,
req
);
wsp
=
WS_Snapshot
(
h2
->
ws
);
(
void
)
h2_new_req
(
wrk
,
h2
,
0
,
NULL
);
break
;
case
1
:
/* Prior Knowledge H1->H2 upgrade */
h2
=
h2_new_sess
(
wrk
,
sp
,
req
);
wsp
=
WS_Snapshot
(
h2
->
ws
);
(
void
)
h2_new_req
(
wrk
,
h2
,
0
,
NULL
);
if
(
!
h2_new_pu_session
(
wrk
,
h2
))
return
;
break
;
case
2
:
/* Optimistic H1->H2 upgrade */
h2
=
h2_new_sess
(
wrk
,
sp
,
NULL
);
wsp
=
WS_Snapshot
(
h2
->
ws
);
(
void
)
h2_new_req
(
wrk
,
h2
,
0
,
NULL
);
if
(
!
h2_new_ou_session
(
wrk
,
h2
,
req
))
return
;
break
;
default:
WRONG
(
"Bad req->err_code"
);
}
h2
=
h2_new_sess
(
wrk
,
sp
,
req
->
err_code
==
H2_PU_MARKER
?
req
:
NULL
);
wsp
=
WS_Snapshot
(
h2
->
ws
);
(
void
)
h2_new_req
(
wrk
,
h2
,
0
,
NULL
);
if
(
req
->
err_code
==
H2_PU_MARKER
&&
!
h2_new_pu_session
(
wrk
,
h2
))
return
;
if
(
req
->
err_code
==
H2_OU_MARKER
&&
!
h2_new_ou_session
(
wrk
,
h2
,
req
))
return
;
THR_SetRequest
(
h2
->
srq
);
...
...
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