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
993ca79e
Commit
993ca79e
authored
Oct 03, 2017
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't reembark h2 streams as http/1 requests
parent
5b849bfc
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
cache_session.c
bin/varnishd/cache/cache_session.c
+3
-2
cache_varnishd.h
bin/varnishd/cache/cache_varnishd.h
+1
-1
cache_http1_fsm.c
bin/varnishd/http1/cache_http1_fsm.c
+1
-1
cache_http2_session.c
bin/varnishd/http2/cache_http2_session.c
+1
-1
No files found.
bin/varnishd/cache/cache_session.c
View file @
993ca79e
...
...
@@ -362,7 +362,7 @@ SES_New(struct pool *pp)
*/
int
SES_Reschedule_Req
(
struct
req
*
req
)
SES_Reschedule_Req
(
struct
req
*
req
,
enum
task_prio
prio
)
{
struct
sess
*
sp
;
struct
pool
*
pp
;
...
...
@@ -372,10 +372,11 @@ SES_Reschedule_Req(struct req *req)
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
pp
=
sp
->
pool
;
CHECK_OBJ_NOTNULL
(
pp
,
POOL_MAGIC
);
AN
(
TASK_QUEUE_CLIENT
(
prio
));
AN
(
req
->
task
.
func
);
return
(
Pool_Task
(
pp
,
&
req
->
task
,
TASK_QUEUE_REQ
));
return
(
Pool_Task
(
pp
,
&
req
->
task
,
prio
));
}
/*--------------------------------------------------------------------
...
...
bin/varnishd/cache/cache_varnishd.h
View file @
993ca79e
...
...
@@ -172,7 +172,7 @@ void SES_DestroyPool(struct pool *);
void
SES_Wait
(
struct
sess
*
,
const
struct
transport
*
);
void
SES_Ref
(
struct
sess
*
sp
);
void
SES_Rel
(
struct
sess
*
sp
);
int
SES_Reschedule_Req
(
struct
req
*
);
int
SES_Reschedule_Req
(
struct
req
*
,
enum
task_prio
);
enum
htc_status_e
{
HTC_S_JUNK
=
-
5
,
...
...
bin/varnishd/http1/cache_http1_fsm.c
View file @
993ca79e
...
...
@@ -188,7 +188,7 @@ http1_reembark(struct worker *wrk, struct req *req)
http1_setstate
(
sp
,
H1BUSY
);
if
(
!
SES_Reschedule_Req
(
req
))
if
(
!
SES_Reschedule_Req
(
req
,
TASK_QUEUE_REQ
))
return
;
/* Couldn't schedule, ditch */
...
...
bin/varnishd/http2/cache_http2_session.c
View file @
993ca79e
...
...
@@ -357,7 +357,7 @@ h2_reembark(struct worker *wrk, struct req *req)
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
assert
(
req
->
transport
==
&
H2_transport
);
if
(
!
SES_Reschedule_Req
(
req
))
if
(
!
SES_Reschedule_Req
(
req
,
TASK_QUEUE_STR
))
return
;
/* Couldn't schedule, ditch */
...
...
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