Commit 9c9e2f9d authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Always send HTTP/1.1 back to the client.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4535 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 91f194dd
...@@ -503,9 +503,9 @@ static void ...@@ -503,9 +503,9 @@ static void
http_ProtoVer(struct http *hp) http_ProtoVer(struct http *hp)
{ {
if (!strcmp(hp->hd[HTTP_HDR_PROTO].b, "HTTP/1.0")) if (!strcasecmp(hp->hd[HTTP_HDR_PROTO].b, "HTTP/1.0"))
hp->protover = 1.0; hp->protover = 1.0;
else if (!strcmp(hp->hd[HTTP_HDR_PROTO].b, "HTTP/1.1")) else if (!strcasecmp(hp->hd[HTTP_HDR_PROTO].b, "HTTP/1.1"))
hp->protover = 1.1; hp->protover = 1.1;
else else
hp->protover = 0.9; hp->protover = 0.9;
...@@ -621,10 +621,7 @@ http_CopyResp(const struct http *to, const struct http *fm) ...@@ -621,10 +621,7 @@ http_CopyResp(const struct http *to, const struct http *fm)
CHECK_OBJ_NOTNULL(fm, HTTP_MAGIC); CHECK_OBJ_NOTNULL(fm, HTTP_MAGIC);
CHECK_OBJ_NOTNULL(to, HTTP_MAGIC); CHECK_OBJ_NOTNULL(to, HTTP_MAGIC);
if (params->client_http11) http_SetH(to, HTTP_HDR_PROTO, "HTTP/1.1");
http_SetH(to, HTTP_HDR_PROTO, "HTTP/1.1");
else
http_copyh(to, fm, HTTP_HDR_PROTO);
http_copyh(to, fm, HTTP_HDR_STATUS); http_copyh(to, fm, HTTP_HDR_STATUS);
http_copyh(to, fm, HTTP_HDR_RESPONSE); http_copyh(to, fm, HTTP_HDR_RESPONSE);
} }
......
...@@ -615,12 +615,6 @@ static const struct parspec input_parspec[] = { ...@@ -615,12 +615,6 @@ static const struct parspec input_parspec[] = {
"Listen queue depth.", "Listen queue depth.",
MUST_RESTART, MUST_RESTART,
"1024", "connections" }, "1024", "connections" },
{ "client_http11", tweak_bool, &master.client_http11, 0, 0,
"Force all client responses to be HTTP/1.1.\n"
"By default we copy the protocol version from the "
"backend response.",
EXPERIMENTAL,
"off", "bool" },
{ "cli_timeout", tweak_timeout, &master.cli_timeout, 0, 0, { "cli_timeout", tweak_timeout, &master.cli_timeout, 0, 0,
"Timeout for the childs replies to CLI requests from " "Timeout for the childs replies to CLI requests from "
"the master.", "the master.",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment