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
89ab8737
Commit
89ab8737
authored
Mar 24, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make http1_dissect() return a simple good/bad status.
parent
7bb2ddb1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
12 deletions
+17
-12
cache_http1_fsm.c
bin/varnishd/http1/cache_http1_fsm.c
+17
-12
No files found.
bin/varnishd/http1/cache_http1_fsm.c
View file @
89ab8737
...
...
@@ -201,7 +201,7 @@ http1_cleanup(struct sess *sp, struct worker *wrk, struct req *req)
/*----------------------------------------------------------------------
*/
static
enum
req_fsm_nx
t
static
in
t
http1_dissect
(
struct
worker
*
wrk
,
struct
req
*
req
)
{
const
char
*
r_100
=
"HTTP/1.1 100 Continue
\r\n\r\n
"
;
...
...
@@ -242,8 +242,8 @@ http1_dissect(struct worker *wrk, struct req *req)
r
=
write
(
req
->
sp
->
fd
,
r_400
,
strlen
(
r_400
));
if
(
r
>
0
)
req
->
acct
.
resp_hdrbytes
+=
r
;
SES_Close
(
req
->
sp
,
SC_RX_JUNK
)
;
return
(
REQ_FSM_DONE
);
req
->
doclose
=
SC_RX_JUNK
;
return
(
-
1
);
}
assert
(
req
->
req_body_status
==
REQ_BODY_INIT
);
...
...
@@ -267,15 +267,15 @@ http1_dissect(struct worker *wrk, struct req *req)
r
=
write
(
req
->
sp
->
fd
,
r_417
,
strlen
(
r_417
));
if
(
r
>
0
)
req
->
acct
.
resp_hdrbytes
+=
r
;
SES_Close
(
req
->
sp
,
SC_RX_JUNK
)
;
return
(
REQ_FSM_DONE
);
req
->
doclose
=
SC_RX_JUNK
;
return
(
-
1
);
}
r
=
write
(
req
->
sp
->
fd
,
r_100
,
strlen
(
r_100
));
if
(
r
>
0
)
req
->
acct
.
resp_hdrbytes
+=
r
;
if
(
r
!=
strlen
(
r_100
))
{
SES_Close
(
req
->
sp
,
SC_REM_CLOSE
)
;
return
(
REQ_FSM_DONE
);
req
->
doclose
=
SC_REM_CLOSE
;
return
(
-
1
);
}
http_Unset
(
req
->
http
,
H_Expect
);
}
...
...
@@ -291,15 +291,14 @@ http1_dissect(struct worker *wrk, struct req *req)
r
=
write
(
req
->
sp
->
fd
,
r_400
,
strlen
(
r_400
));
if
(
r
>
0
)
req
->
acct
.
resp_hdrbytes
+=
r
;
SES_Close
(
req
->
sp
,
req
->
doclose
);
return
(
REQ_FSM_DONE
);
return
(
-
1
);
}
assert
(
req
->
req_body_status
!=
REQ_BODY_INIT
);
HTTP_Copy
(
req
->
http0
,
req
->
http
);
// For ESI & restart
return
(
REQ_FSM_MORE
);
return
(
0
);
}
/*----------------------------------------------------------------------
...
...
@@ -372,8 +371,14 @@ HTTP1_Session(struct worker *wrk, struct req *req)
req
->
req_step
==
R_STP_LOOKUP
||
req
->
req_step
==
R_STP_RECV
);
if
(
req
->
req_step
==
R_STP_RECV
)
nxt
=
http1_dissect
(
wrk
,
req
);
if
(
req
->
req_step
==
R_STP_RECV
)
{
if
(
http1_dissect
(
wrk
,
req
))
{
SES_Close
(
req
->
sp
,
req
->
doclose
);
nxt
=
REQ_FSM_DONE
;
}
else
{
nxt
=
REQ_FSM_MORE
;
}
}
if
(
nxt
==
REQ_FSM_MORE
)
nxt
=
CNT_Request
(
wrk
,
req
);
if
(
nxt
==
REQ_FSM_DISEMBARK
)
{
...
...
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