bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix NetworkService ServerTest.* failures and test name typo (see issue #2622).

Browse Source 
Always return ERR_NONE and the response body if a CefURLRequest completes
successfully, including for non-2xx status codes. This matches the behavior of
the old network stack.

To test: ServerTest.* tests pass with NetworkService enabled.
This commit is contained in:
Marshall Greenblatt
2019-05-18 17:42:00 +03:00
parent 9a30f05f80
commit bddf2a311b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libcef/browser/net_service/browser_urlrequest_impl.cc
View File

@@ -211,11 +211,10 @@ class CefBrowserURLRequest::Context
} }
} }
if (request_flags & UR_FLAG_NO_RETRY_ON_5XX) { // Allow delivery of non-2xx response bodies.
// No retries is the default setting, so we don't need to configure that. loader_->SetAllowHttpErrorResults(true);
// Allow delivery of non-2xx response bodies.
loader_->SetAllowHttpErrorResults(true); if (!(request_flags & UR_FLAG_NO_RETRY_ON_5XX)) {
} else {
// Allow 2 retries on 5xx response or network change. // Allow 2 retries on 5xx response or network change.
// TODO(network): Consider exposing configuration of max retries and/or // TODO(network): Consider exposing configuration of max retries and/or
// RETRY_ON_NETWORK_CHANGE as a separate flag. // RETRY_ON_NETWORK_CHANGE as a separate flag.

2
tests/ceftests/resource_request_handler_unittest.cc
View File

@@ -3057,7 +3057,7 @@ TEST(ResourceRequestHandlerTest, FilterPassThruReadAll) {
} }
// Pass through contents unchanged. Read limited input. // Pass through contents unchanged. Read limited input.
TEST(ResouseRequestHandlerTest, FilterPassThruReadLimited) { TEST(ResourceRequestHandlerTest, FilterPassThruReadLimited) {
CefRefPtr<ResponseFilterTestHandler> handler = CefRefPtr<ResponseFilterTestHandler> handler =
new ResponseFilterTestHandler(new ResponseFilterPassThru(true)); new ResponseFilterTestHandler(new ResponseFilterPassThru(true));
handler->ExecuteTest(); handler->ExecuteTest();

2
tests/ceftests/server_unittest.cc
View File

@@ -952,6 +952,8 @@ class StaticHttpRequestRunner : public HttpTestRunner::RequestRunner {
static scoped_ptr<HttpTestRunner::RequestRunner> Create500( static scoped_ptr<HttpTestRunner::RequestRunner> Create500(
const std::string& path) { const std::string& path) {
CefRefPtr<CefRequest> request = CreateTestServerRequest(path, "GET"); CefRefPtr<CefRequest> request = CreateTestServerRequest(path, "GET");
// Don't retry the request.
request->SetFlags(UR_FLAG_NO_RETRY_ON_5XX);
HttpServerResponse response(HttpServerResponse::TYPE_500); HttpServerResponse response(HttpServerResponse::TYPE_500);
response.error_message = "Something went wrong!"; response.error_message = "Something went wrong!";
return make_scoped_ptr<HttpTestRunner::RequestRunner>( return make_scoped_ptr<HttpTestRunner::RequestRunner>(