net/server/http_server.cc - Issue 251213004: HttpServer: avoid DCHECK'ing on non-HTTP/1.1 requests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/server/http_server.cc

Issue 251213004: HttpServer: avoid DCHECK'ing on non-HTTP/1.1 requests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rm spurious nl Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: net/server/http_server.cc

diff --git a/net/server/http_server.cc b/net/server/http_server.cc

index df77c3672daa423fe54127495aa18b7a4262a104..20926e736680f88871146cf0e8741ec1fb6a3d9a 100644

--- a/net/server/http_server.cc

+++ b/net/server/http_server.cc

@@ -13,6 +13,7 @@

#include "base/sys_byteorder.h"

#include "build/build_config.h"

#include "net/base/net_errors.h"

+#include "net/http/http_util.h"

#include "net/server/http_connection.h"

#include "net/server/http_server_request_info.h"

#include "net/server/http_server_response_info.h"

@@ -282,8 +283,10 @@ bool HttpServer::ParseHeaders(HttpConnection* connection,

buffer.clear();

break;

case ST_PROTO:

- // TODO(mbelshe): Deal better with parsing protocol.

- DCHECK(buffer == "HTTP/1.1");

+ if (!HttpUtil::ParseVersion(buffer, &info->http_version)) {

+ // Treat everything else like HTTP 1.0

+ info->http_version = HttpVersion(1, 0);

+ }

buffer.clear();

break;

case ST_NAME:

« no previous file with comments | « net/http/http_util.cc ('k') | net/server/http_server_request_info.h » ('j') | no next file with comments »