Merge r166405 - [GTK] Too many redirects visiting www.globalforestwat…

…ch.org

https://bugs.webkit.org/show_bug.cgi?id=129681

Patch by Diego Pino Garcia <dpino@igalia.com> on 2014-03-28
Reviewed by Martin Robinson.

Source/WebCore:

* platform/gtk/UserAgentGtk.cpp:
(WebCore::standardUserAgent): Append Safari version to UserAgent
string.

Source/WebKit/gtk:

* webkit/webkitwebsettings.cpp:
(userAgentForURL): Change outdated comment.

Source/WebCore/ChangeLog

@@ -1,3 +1,14 @@
+2014-03-28  Diego Pino Garcia  <dpino@igalia.com>
+
+        [GTK] Too many redirects visiting www.globalforestwatch.org
+        https://bugs.webkit.org/show_bug.cgi?id=129681
+
+        Reviewed by Martin Robinson.
+
+        * platform/gtk/UserAgentGtk.cpp:
+        (WebCore::standardUserAgent): Append Safari version to UserAgent
+        string.
+
 2014-03-19  Claudio Saavedra  <csaavedra@igalia.com>
 
         [GStreamer] Clean timeout source ids

Source/WebCore/platform/gtk/UserAgentGtk.cpp

@@ -70,7 +70,7 @@ String standardUserAgent(const String& applicationName, const String& applicatio
     // wrong can cause sites to load the wrong JavaScript, CSS, or custom fonts. In some cases
     // sites won't load resources at all.
     DEFINE_STATIC_LOCAL(const CString, uaVersion, (String::format("%i.%i", USER_AGENT_GTK_MAJOR_VERSION, USER_AGENT_GTK_MINOR_VERSION).utf8()));
-    DEFINE_STATIC_LOCAL(const String, staticUA, (String::format("Mozilla/5.0 (Macintosh; %s) AppleWebKit/%s (KHTML, like Gecko) Safari/%s",
+    DEFINE_STATIC_LOCAL(const String, staticUA, (String::format("Mozilla/5.0 (Macintosh; %s) AppleWebKit/%s (KHTML, like Gecko) Safari/%s Version/6.0",
         platformVersionForUAString().utf8().data(), uaVersion.data(), uaVersion.data())));
 
     if (applicationName.isEmpty())

Source/WebKit/gtk/ChangeLog

@@ -1,3 +1,13 @@
+2014-03-28  Diego Pino Garcia  <dpino@igalia.com>
+
+        [GTK] Too many redirects visiting www.globalforestwatch.org
+        https://bugs.webkit.org/show_bug.cgi?id=129681
+
+        Reviewed by Martin Robinson.
+
+        * webkit/webkitwebsettings.cpp:
+        (userAgentForURL): Change outdated comment.
+
 2014-03-24  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update NEWS and Versions.m4 for 2.4.0 release.

Source/WebKit/gtk/webkit/webkitwebsettings.cpp

@@ -1612,7 +1612,7 @@ static bool isGoogleDomain(String host)
 static String userAgentForURL(const URL& url)
 {
     // For Google domains, drop the browser's custom User Agent string, and use the
-    // standard Chrome one, so they don't give us a broken experience.
+    // standard one, so they don't give us a broken experience.
     if (isGoogleDomain(url.host()))
         return standardUserAgent();