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
9a267ba2
Commit
9a267ba2
authored
Mar 12, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Have HTTP1 use the new R_STP_TRANSPORT as well.
parent
255b99a9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
18 deletions
+6
-18
cache.h
bin/varnishd/cache/cache.h
+0
-1
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+4
-14
cache_http1_fsm.c
bin/varnishd/http1/cache_http1_fsm.c
+2
-3
No files found.
bin/varnishd/cache/cache.h
View file @
9a267ba2
...
...
@@ -942,7 +942,6 @@ void VRB_Free(struct req *);
/* cache_req_fsm.c [CNT] */
enum
req_fsm_nxt
CNT_Request
(
struct
worker
*
,
struct
req
*
);
void
CNT_AcctLogCharge
(
struct
dstat
*
,
struct
req
*
);
int
CNT_GotReq
(
struct
worker
*
,
struct
req
*
);
/* cache_session.c [SES] */
struct
sess
*
SES_New
(
struct
pool
*
);
...
...
bin/varnishd/cache/cache_req_fsm.c
View file @
9a267ba2
...
...
@@ -53,8 +53,8 @@
* Handle "Expect:" and "Connection:" on incoming request
*/
in
t
CNT_GotReq
(
struct
worker
*
wrk
,
struct
req
*
req
)
static
enum
req_fsm_nx
t
cnt_transport
(
struct
worker
*
wrk
,
struct
req
*
req
)
{
const
char
*
p
;
...
...
@@ -70,7 +70,7 @@ CNT_GotReq(struct worker *wrk, struct req *req)
req
->
doclose
=
SC_RX_JUNK
;
(
void
)
req
->
transport
->
minimal_response
(
req
,
417
);
wrk
->
stats
->
client_req_417
++
;
return
(
-
1
);
return
(
REQ_FSM_DONE
);
}
if
(
req
->
http
->
protover
>=
11
&&
req
->
htc
->
pipeline_b
==
NULL
)
// XXX: HTTP1 vs 2 ?
...
...
@@ -87,20 +87,10 @@ CNT_GotReq(struct worker *wrk, struct req *req)
req
->
doclose
=
http_DoConnection
(
req
->
http
);
if
(
req
->
doclose
==
SC_RX_BAD
)
{
(
void
)
req
->
transport
->
minimal_response
(
req
,
400
);
return
(
-
1
);
return
(
REQ_FSM_DONE
);
}
HTTP_Copy
(
req
->
http0
,
req
->
http
);
// For ESI & restart
return
(
0
);
}
static
enum
req_fsm_nxt
cnt_transport
(
struct
worker
*
wrk
,
struct
req
*
req
)
{
if
(
CNT_GotReq
(
wrk
,
req
))
return
(
REQ_FSM_DONE
);
req
->
req_step
=
R_STP_RECV
;
return
(
REQ_FSM_MORE
);
}
...
...
bin/varnishd/http1/cache_http1_fsm.c
View file @
9a267ba2
...
...
@@ -319,8 +319,7 @@ http1_dissect(struct worker *wrk, struct req *req)
default:
WRONG
(
"Unknown req_body_status situation"
);
}
return
(
CNT_GotReq
(
wrk
,
req
));
return
(
0
);
}
/*----------------------------------------------------------------------
...
...
@@ -436,7 +435,7 @@ HTTP1_Session(struct worker *wrk, struct req *req)
return
;
}
}
req
->
req_step
=
R_STP_
RECV
;
req
->
req_step
=
R_STP_
TRANSPORT
;
http1_setstate
(
sp
,
H1PROC
);
}
else
if
(
st
==
H1BUSY
)
{
CHECK_OBJ_NOTNULL
(
req
->
transport
,
TRANSPORT_MAGIC
);
...
...
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