Modified: trunk/Source/WebKit/ChangeLog (239592 => 239593)
--- trunk/Source/WebKit/ChangeLog 2019-01-03 16:51:44 UTC (rev 239592)
+++ trunk/Source/WebKit/ChangeLog 2019-01-03 17:03:44 UTC (rev 239593)
@@ -1,3 +1,16 @@
+2019-01-03 Chris Dumez <[email protected]>
+
+ Add release logging to help debug HTTPS upgrade issues
+ https://bugs.webkit.org/show_bug.cgi?id=193075
+
+ Reviewed by Alex Christensen.
+
+ Add release logging to help debug HTTPS upgrade issues like Bug 193026.
+
+ * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
+ (WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker):
+ (WebKit::NetworkHTTPSUpgradeChecker::query):
+
2019-01-03 Alex Christensen <[email protected]>
NetworkProcess should initialize its default NetworkSession with parameters from the UIProcess
Modified: trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp (239592 => 239593)
--- trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp 2019-01-03 16:51:44 UTC (rev 239592)
+++ trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp 2019-01-03 17:03:44 UTC (rev 239593)
@@ -36,6 +36,7 @@
#include <wtf/WorkQueue.h>
#define RELEASE_LOG_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_ERROR_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__)
namespace WebKit {
@@ -63,9 +64,11 @@
ASSERT(path);
bool isDatabaseOpen = m_database->open(path);
- ASSERT(isDatabaseOpen);
- if (!isDatabaseOpen)
+ if (!isDatabaseOpen) {
+ RELEASE_LOG_ERROR(Network, "%p - NetworkHTTPSUpgradeChecker::open failed, error message: %{public}s, database path: %{public}s", this, m_database->lastErrorMsg(), path.utf8().data());
+ ASSERT_NOT_REACHED();
return;
+ }
// Since we are using a workerQueue, the sequential dispatch blocks may be called by different threads.
m_database->disableThreadingChecks();
@@ -96,7 +99,14 @@
ASSERT_UNUSED(bindTextResult, bindTextResult == SQLITE_OK);
int stepResult = m_statement->step();
- ASSERT(stepResult == SQLITE_ROW || stepResult == SQLITE_DONE);
+ if (stepResult != SQLITE_ROW && stepResult != SQLITE_DONE) {
+ RELEASE_LOG_ERROR_IF_ALLOWED(sessionID, "step failed with error code %d, error message: %{public}s, database path: %{public}s", stepResult, m_database->lastErrorMsg(), networkHTTPSUpgradeCheckerDatabasePath().utf8().data());
+ ASSERT_NOT_REACHED();
+ RunLoop::main().dispatch([callback = WTFMove(callback)] () mutable {
+ callback(false);
+ });
+ return;
+ }
int resetResult = m_statement->reset();
ASSERT_UNUSED(resetResult, resetResult == SQLITE_OK);
