Title: [91954] trunk/Source/WebCore
- Revision
- 91954
- Author
- [email protected]
- Date
- 2011-07-28 16:26:34 -0700 (Thu, 28 Jul 2011)
Log Message
[Soup] Cannot override default max-conns and max-conns-per-host Soup Session settings
https://bugs.webkit.org/show_bug.cgi?id=64355
Default max-conns and max-conns-per-host are set at "first contact" with
a site instead of at creation time. This results in values being
overwritten if they are set prior to said "first contact"; which is the
most likely (or only) scenario.
Patch by Marco Peereboom <[email protected]> on 2011-07-28
Reviewed by Martin Robinson.
No new tests. Rigged libsoup and xxxterm web browser to diagnose the
issue and validate the patch.
* platform/graphics/FontFallbackList.cpp:
(WebCore::FontFallbackList::determinePitch):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91953 => 91954)
--- trunk/Source/WebCore/ChangeLog 2011-07-28 23:22:39 UTC (rev 91953)
+++ trunk/Source/WebCore/ChangeLog 2011-07-28 23:26:34 UTC (rev 91954)
@@ -1,3 +1,20 @@
+2011-07-28 Marco Peereboom <[email protected]>
+
+ [Soup] Cannot override default max-conns and max-conns-per-host Soup Session settings
+ https://bugs.webkit.org/show_bug.cgi?id=64355
+ Default max-conns and max-conns-per-host are set at "first contact" with
+ a site instead of at creation time. This results in values being
+ overwritten if they are set prior to said "first contact"; which is the
+ most likely (or only) scenario.
+
+ Reviewed by Martin Robinson.
+
+ No new tests. Rigged libsoup and xxxterm web browser to diagnose the
+ issue and validate the patch.
+
+ * platform/graphics/FontFallbackList.cpp:
+ (WebCore::FontFallbackList::determinePitch):
+
2011-07-28 Brady Eidson <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=65323
Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (91953 => 91954)
--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2011-07-28 23:22:39 UTC (rev 91953)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2011-07-28 23:26:34 UTC (rev 91954)
@@ -144,13 +144,6 @@
static void ensureSessionIsInitialized(SoupSession* session)
{
- // Values taken from http://stevesouders.com/ua/index.php following
- // the rule "Do What Every Other Modern Browser Is Doing". They seem
- // to significantly improve page loading time compared to soup's
- // default values.
- static const int maxConnections = 60;
- static const int maxConnectionsPerHost = 6;
-
if (g_object_get_data(G_OBJECT(session), "webkit-init"))
return;
@@ -172,11 +165,6 @@
g_object_unref(requester);
}
- g_object_set(session,
- SOUP_SESSION_MAX_CONNS, maxConnections,
- SOUP_SESSION_MAX_CONNS_PER_HOST, maxConnectionsPerHost,
- NULL);
-
g_object_set_data(G_OBJECT(session), "webkit-init", reinterpret_cast<void*>(0xdeadbeef));
}
@@ -849,7 +837,22 @@
SoupSession* ResourceHandle::defaultSession()
{
- static SoupSession* session = soup_session_async_new();
+ static SoupSession* session = 0;
+ // Values taken from http://stevesouders.com/ua/index.php following
+ // the rule "Do What Every Other Modern Browser Is Doing". They seem
+ // to significantly improve page loading time compared to soup's
+ // default values.
+ static const int maxConnections = 60;
+ static const int maxConnectionsPerHost = 6;
+
+ if (!session) {
+ session = soup_session_async_new();
+ g_object_set(session,
+ SOUP_SESSION_MAX_CONNS, maxConnections,
+ SOUP_SESSION_MAX_CONNS_PER_HOST, maxConnectionsPerHost,
+ NULL);
+ }
+
return session;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
