diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp b/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp index 7dacc226e..f17ac6cee 100644 --- a/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp +++ b/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp @@ -29,9 +29,7 @@ #define LIBSOUP_USE_UNSTABLE_REQUEST_API -#include "WebAuthDialog.h" #include "WKBase.h" -#include <WebCore/GtkAuthenticationDialog.h> #include <WebCore/ResourceHandle.h> #include <WebCore/RunLoop.h> #include <WebKit2/WebProcess.h> @@ -66,12 +64,10 @@ WK_EXPORT int WebProcessMainGtk(int argc, char* argv[]) int socket = atoi(argv[1]); WebProcess::shared().initialize(socket, RunLoop::main()); - SoupSession* session = WebCore::ResourceHandle::defaultSession(); - soup_session_add_feature_by_type(session, WEB_TYPE_AUTH_DIALOG); - // Despite using system CAs to validate certificates we're // accepting invalid certificates by default. New API will be // added later to let client accept/discard invalid certificates. + SoupSession* session = WebCore::ResourceHandle::defaultSession(); g_object_set(session, SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, SOUP_SESSION_SSL_STRICT, FALSE, NULL); |