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
8cecc142
Commit
8cecc142
authored
Mar 10, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify
parent
0bc64c60
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
10 deletions
+7
-10
cache_http2.h
bin/varnishd/http2/cache_http2.h
+2
-1
cache_http2_session.c
bin/varnishd/http2/cache_http2_session.c
+5
-9
No files found.
bin/varnishd/http2/cache_http2.h
View file @
8cecc142
...
...
@@ -144,6 +144,8 @@ struct h2_sess {
uint32_t
highest_stream
;
int
bogosity
;
struct
h2_req
*
req0
;
struct
h2_req_s
streams
;
struct
req
*
srq
;
...
...
@@ -166,7 +168,6 @@ struct h2_sess {
VTAILQ_HEAD
(,
h2_req
)
txqueue
;
struct
h2_req
req0
[
1
];
h2_error
error
;
};
...
...
bin/varnishd/http2/cache_http2_session.c
View file @
8cecc142
...
...
@@ -109,8 +109,6 @@ h2_new_sess(const struct worker *wrk, struct sess *sp, struct req *srq)
SES_Reserve_xport_priv
(
sp
,
&
up
);
*
up
=
(
uintptr_t
)
h2
;
INIT_OBJ
(
h2
->
req0
,
H2_REQ_MAGIC
);
h2
->
req0
->
h2sess
=
h2
;
}
AN
(
up
);
CAST_OBJ_NOTNULL
(
h2
,
(
void
*
)(
*
up
),
H2_SESS_MAGIC
);
...
...
@@ -215,7 +213,7 @@ h2_b64url_settings(struct h2_sess *h2, struct req *req)
/**********************************************************************/
static
int
h2_
new_
pu_session
(
struct
worker
*
wrk
,
const
struct
h2_sess
*
h2
)
h2_pu_session
(
struct
worker
*
wrk
,
const
struct
h2_sess
*
h2
)
{
enum
htc_status_e
hs
;
...
...
@@ -240,7 +238,7 @@ h2_new_pu_session(struct worker *wrk, const struct h2_sess *h2)
/**********************************************************************/
static
int
h2_
new_
ou_session
(
const
struct
worker
*
wrk
,
struct
h2_sess
*
h2
,
h2_ou_session
(
const
struct
worker
*
wrk
,
struct
h2_sess
*
h2
,
struct
req
*
req
)
{
ssize_t
sz
;
...
...
@@ -333,12 +331,10 @@ h2_new_session(struct worker *wrk, void *arg)
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
);
h2
->
req0
=
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
))
{
if
((
req
->
err_code
==
H2_PU_MARKER
&&
!
h2_pu_session
(
wrk
,
h2
))
||
(
req
->
err_code
==
H2_OU_MARKER
&&
!
h2_ou_session
(
wrk
,
h2
,
req
)))
{
CNT_AcctLogCharge
(
wrk
->
stats
,
req
);
VCL_Rel
(
&
req
->
vcl
);
Req_Release
(
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