e012801420
* Update to Chromium 68.0.3440.128 and Node 10.10.0
* update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches
* fix SSL_get_tlsext_status_type patch
* pass encryption_modes_supported to CdmInfo
* kNoSandbox moved into service_manager
* bump CHROME_VERSION_STRING
TODO: automatically pull in the real chrome version
* PathService -> base::PathService
* net::X509Certificate::Equals -> net::X509Certificate::EqualsExcludingChain
* use content::ChildProcessTerminationInfo
* GetHandle() -> GetProcess().Handle()
* ScopedNestableTaskAllower doesn't take an argument
* net::HttpAuthCache::ClearEntriesAddedWithin -> ClearAllEntries
* std::unique_ptr<WebContents>
* blink::WebFullscreenOptions
* OnAudioStateChanged doesn't take a WebContents
* content::RESULT_CODE_NORMAL_EXIT -> service_manager::RESULT_CODE_NORMAL_EXIT
* MessageLoopCurrent
* WasResized -> SynchronizeVisualProperties
* SetTimeStamp takes a base::TimeTicks
* ExecuteScriptInIsolatedWorld is single-script only
* DispatchNonPersistentCloseEvent takes a callback now
* expose URLRequestContextGetter::{Add,Remove}Observer
* test: remove no longer existing Chromium test deps
cc_blink_unittests has been removed in
https://chromium-review.googlesource.com/1053765
mojo_common_unittests has been removed in
https://chromium-review.googlesource.com/1028000
* SetFdLimit -> IncreaseFdLimitTo
NOTE: the behaviour of this API has changed slightly, and we should
mention that in the notes.
* MessageLoop::QuitWhenIdleClosure -> RunLoop::QuitCurrentWhenIdleClosureDeprecated
* certificate_transparency moved out of net/
pending a clearer decision about what to do with CT
in the mean time, copy CreateLogVerifiersForKnownLogs from deleted chromium source
* add secure_origin_whitelist to chrome source list
NOTE: is this something we actually want? cc @deepak1556
* DrainBackgroundTasks -> DrainTasks
* use new node options parser
* fix disable_scroll_begin_dcheck.patch
* ViewsDelegate::CreateWebContents went away
see 1031314
* kZygoteProcess moved into service_manager
* test: minor improvements to the Node spec
- reformat some parts
- better failures reporting with `expect`
- skip some tests instead of marking them as passed
* chromium removed *_posix.cc from the source filters
* test: fix :electron_tests compilation
* better crash diagnostics in ffmpeg test
* fix: enable back a DCHECK in viz::ServerSharedBitmapManager
Fixes #14327.
Backports https://chromium-review.googlesource.com/802574.
* chore: update linux sysroots
* chore: remove obsolete "install-sysroot.py" script
* test: fix frame-subscriber test on Mac
* disable OSR for now
* test: make before-input-event test more robust
* test: make run-as-node --inspect test more robust on windows
* roll node to v10.11.0
* avoid duplicate files when building a zip
* disable failing assert in beginFrameSubscription dirty-rectangle test
* experiment with is_cfi = false
* fix: build torque with x64 toolchain
Co-Authored-By: Alexey Kuzmin <github@alexeykuzmin.com>
* test: disable the "app.relaunch" test on Linux
* chore: bump node to get header tar file
* chore: bump node to fix tar.py line endings
79 lines
3.6 KiB
Diff
79 lines
3.6 KiB
Diff
diff --git a/third_party/crashpad/crashpad/util/net/http_transport.h b/third_party/crashpad/crashpad/util/net/http_transport.h
|
|
index f91a556..acd4e44 100644
|
|
--- a/third_party/crashpad/crashpad/util/net/http_transport.h
|
|
+++ b/third_party/crashpad/crashpad/util/net/http_transport.h
|
|
@@ -90,7 +90,7 @@
|
|
//! if the response body is not required.
|
|
//!
|
|
//! \return Whether or not the request was successful, defined as returning
|
|
- //! a HTTP status 200 (OK) code.
|
|
+ //! a HTTP status code in the range 200-203 (inclusive).
|
|
virtual bool ExecuteSynchronously(std::string* response_body) = 0;
|
|
|
|
protected:
|
|
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_mac.mm b/third_party/crashpad/crashpad/util/net/http_transport_mac.mm
|
|
index 8d5f78c..a433bb3 100644
|
|
--- a/third_party/crashpad/crashpad/util/net/http_transport_mac.mm
|
|
+++ b/third_party/crashpad/crashpad/util/net/http_transport_mac.mm
|
|
@@ -293,7 +293,7 @@
|
|
return false;
|
|
}
|
|
NSInteger http_status = [http_response statusCode];
|
|
- if (http_status != 200) {
|
|
+ if (http_status < 200 || http_status > 203) {
|
|
LOG(ERROR) << base::StringPrintf("HTTP status %ld",
|
|
implicit_cast<long>(http_status));
|
|
return false;
|
|
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_socket.cc b/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
|
|
index f0e2dc1..34d8dee 100644
|
|
--- a/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
|
|
+++ b/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
|
|
@@ -457,10 +457,18 @@
|
|
LOG(ERROR) << "ReadLine";
|
|
return false;
|
|
}
|
|
- static constexpr const char kHttp10[] = "HTTP/1.0 200 ";
|
|
- static constexpr const char kHttp11[] = "HTTP/1.1 200 ";
|
|
- return StartsWith(response_line, kHttp10, strlen(kHttp10)) ||
|
|
- StartsWith(response_line, kHttp11, strlen(kHttp11));
|
|
+ static constexpr const char kHttp10[] = "HTTP/1.0 ";
|
|
+ static constexpr const char kHttp11[] = "HTTP/1.1 ";
|
|
+ if (!(StartsWith(response_line, kHttp10, strlen(kHttp10)) ||
|
|
+ StartsWith(response_line, kHttp11, strlen(kHttp11))) ||
|
|
+ response_line.size() < strlen(kHttp10) + 3 ||
|
|
+ response_line.at(strlen(kHttp10) + 3) != ' ') {
|
|
+ return false;
|
|
+ }
|
|
+ unsigned int http_status = 0;
|
|
+ return base::StringToUint(response_line.substr(strlen(kHttp10), 3),
|
|
+ &http_status) &&
|
|
+ http_status >= 200 && http_status <= 203;
|
|
}
|
|
|
|
bool ReadResponseHeaders(int sock, HTTPHeaders* headers) {
|
|
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_test.cc b/third_party/crashpad/crashpad/util/net/http_transport_test.cc
|
|
index 7b5f41d..d73dc99 100644
|
|
--- a/third_party/crashpad/crashpad/util/net/http_transport_test.cc
|
|
+++ b/third_party/crashpad/crashpad/util/net/http_transport_test.cc
|
|
@@ -137,7 +137,7 @@
|
|
|
|
std::string response_body;
|
|
bool success = transport->ExecuteSynchronously(&response_body);
|
|
- if (response_code_ == 200) {
|
|
+ if (response_code_ >= 200 && response_code_ <= 203) {
|
|
EXPECT_TRUE(success);
|
|
std::string expect_response_body = random_string + "\r\n";
|
|
EXPECT_EQ(response_body, expect_response_body);
|
|
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_win.cc b/third_party/crashpad/crashpad/util/net/http_transport_win.cc
|
|
index 18d343c..2919bc1 100644
|
|
--- a/third_party/crashpad/crashpad/util/net/http_transport_win.cc
|
|
+++ b/third_party/crashpad/crashpad/util/net/http_transport_win.cc
|
|
@@ -375,7 +375,7 @@
|
|
return false;
|
|
}
|
|
|
|
- if (status_code != 200) {
|
|
+ if (status_code < 200 || status_code > 203) {
|
|
LOG(ERROR) << base::StringPrintf("HTTP status %lu", status_code);
|
|
return false;
|
|
}
|