Diff
Modified: trunk/Source/WebCore/ChangeLog (107967 => 107968)
--- trunk/Source/WebCore/ChangeLog 2012-02-16 20:30:09 UTC (rev 107967)
+++ trunk/Source/WebCore/ChangeLog 2012-02-16 20:32:06 UTC (rev 107968)
@@ -1,3 +1,14 @@
+2012-02-16 Philippe Normand <[email protected]>
+
+ Unreviewed, rolling out r107941.
+ http://trac.webkit.org/changeset/107941
+ https://bugs.webkit.org/show_bug.cgi?id=68602
+
+ Broke 23 http tests on GTK
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::ResourceHandle::defaultSession):
+
2012-02-16 Tom Sepez <[email protected]>
XSS Auditor bypass with U+2028/2029
Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (107967 => 107968)
--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2012-02-16 20:30:09 UTC (rev 107967)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2012-02-16 20:32:06 UTC (rev 107968)
@@ -734,12 +734,8 @@
if (!session) {
session = soup_session_async_new();
g_object_set(session,
- SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_DECODER,
- SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_SNIFFER,
- SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
SOUP_SESSION_MAX_CONNS, maxConnections,
- SOUP_SESSION_MAX_CONNS_PER_HOST, maxConnectionsPerHost,
- SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
+ SOUP_SESSION_MAX_CONNS_PER_HOST, maxConnectionsPerHost,
NULL);
}
Modified: trunk/Source/WebKit/gtk/ChangeLog (107967 => 107968)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-02-16 20:30:09 UTC (rev 107967)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-02-16 20:32:06 UTC (rev 107968)
@@ -1,3 +1,14 @@
+2012-02-16 Philippe Normand <[email protected]>
+
+ Unreviewed, rolling out r107941.
+ http://trac.webkit.org/changeset/107941
+ https://bugs.webkit.org/show_bug.cgi?id=68602
+
+ Broke 23 http tests on GTK
+
+ * webkit/webkitglobals.cpp:
+ (webkitInit):
+
2012-02-16 Sergio Villar Senin <[email protected]>
[soup] Move important SoupSession feature initialization to WebCore
Modified: trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp (107967 => 107968)
--- trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp 2012-02-16 20:30:09 UTC (rev 107967)
+++ trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp 2012-02-16 20:32:06 UTC (rev 107968)
@@ -336,6 +336,12 @@
soup_session_add_feature(session, authDialog);
g_object_unref(authDialog);
+ SoupSessionFeature* sniffer = static_cast<SoupSessionFeature*>(g_object_new(SOUP_TYPE_CONTENT_SNIFFER, NULL));
+ soup_session_add_feature(session, sniffer);
+ g_object_unref(sniffer);
+
+ soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
+
#if USE(CLUTTER)
gtk_clutter_init(0, 0);
#endif
Modified: trunk/Source/WebKit2/ChangeLog (107967 => 107968)
--- trunk/Source/WebKit2/ChangeLog 2012-02-16 20:30:09 UTC (rev 107967)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-16 20:32:06 UTC (rev 107968)
@@ -1,3 +1,14 @@
+2012-02-16 Philippe Normand <[email protected]>
+
+ Unreviewed, rolling out r107941.
+ http://trac.webkit.org/changeset/107941
+ https://bugs.webkit.org/show_bug.cgi?id=68602
+
+ Broke 23 http tests on GTK
+
+ * WebProcess/gtk/WebProcessMainGtk.cpp:
+ (WebKit::WebProcessMainGtk):
+
2012-02-16 No'am Rosenthal <[email protected]>
[Texmap] Improve the way we deal with BGRA extension
Modified: trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp (107967 => 107968)
--- trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2012-02-16 20:30:09 UTC (rev 107967)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2012-02-16 20:32:06 UTC (rev 107968)
@@ -60,6 +60,8 @@
RunLoop::initializeMainRunLoop();
SoupSession* session = WebCore::ResourceHandle::defaultSession();
+ soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_SNIFFER);
+ soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
soup_session_add_feature_by_type(session, WEB_TYPE_AUTH_DIALOG);
int socket = atoi(argv[1]);
