Changeset 91954 in webkit

Timestamp:

Jul 28, 2011 4:26:34 PM (13 years ago)

Author:

commit-queue@webkit.org

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 <​marco@peereboom.us> 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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-28  Marco Peereboom  <marco@peereboom.us>
+
+        [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  <beidson@apple.com>
 

trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -145 +145 @@
 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 +165 @@
         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));
@@ -850 +838 @@
 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;
 }