Changeset 79589 in webkit


Ignore:
Timestamp:
Feb 24, 2011 10:42:28 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-02-24 Peter Kasting <​pkasting@google.com>

Reviewed by Eric Seidel.

Drop the "U; " encryption level from the User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54566

  • http/tests/navigation/useragent-expected.txt:
  • http/tests/navigation/useragent.php:

2011-02-24 Peter Kasting <​pkasting@google.com>

Reviewed by Eric Seidel.

Drop the "U; " encryption level from the User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54566

  • StringsNotToBeLocalized.txt:

2011-02-24 Peter Kasting <​pkasting@google.com>

Reviewed by Eric Seidel.

Drop the "U; " encryption level from the User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54566

  • WebCoreSupport/FrameLoaderClientEfl.cpp: (WebCore::composeUserAgent):
  • ewk/ewk_settings.cpp: (ewk_settings_default_user_agent_get):

2011-02-24 Peter Kasting <​pkasting@google.com>

Reviewed by Eric Seidel.

Drop the "U; " encryption level from the User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54566

  • webkit/webkitwebsettings.cpp: (webkitUserAgent):

2011-02-24 Peter Kasting <​pkasting@google.com>

Reviewed by Eric Seidel.

Drop the "U; " encryption level from the User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54566

  • WebView/WebView.mm: (+[WebView _standardUserAgentWithApplicationName:]):

2011-02-24 Peter Kasting <​pkasting@google.com>

Reviewed by Eric Seidel.

Drop the "U; " encryption level from the User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54566

  • Api/qwebpage.cpp: (QWebPage::userAgentForUrl):

2011-02-24 Peter Kasting <​pkasting@google.com>

Reviewed by Eric Seidel.

Drop the "U; " encryption level from the User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54566

  • WebView.cpp: (WebView::standardUserAgentWithApplicationName):

2011-02-24 Peter Kasting <​pkasting@google.com>

Reviewed by Eric Seidel.

Drop the "U; " encryption level from the User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54566

  • WebKitSupport/FrameLoaderClientWx.cpp: (WebCore::FrameLoaderClientWx::userAgent):

2011-02-24 Peter Kasting <​pkasting@google.com>

Reviewed by Eric Seidel.

Drop the "U; " encryption level from the User Agent string.
​https://bugs.webkit.org/show_bug.cgi?id=54566

  • UIProcess/gtk/WebPageProxyGtk.cpp: (WebKit::WebPageProxy::standardUserAgent):
  • UIProcess/mac/WebPageProxyMac.mm: (WebKit::WebPageProxy::standardUserAgent):
  • UIProcess/qt/WebPageProxyQt.cpp: (WebKit::WebPageProxy::standardUserAgent):
  • UIProcess/win/WebPageProxyWin.cpp: (WebKit::WebPageProxy::standardUserAgent):
Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r79583 r79589  
     12011-02-24  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Drop the "U; " encryption level from the User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54566
     7
     8        * http/tests/navigation/useragent-expected.txt:
     9        * http/tests/navigation/useragent.php:
     10
    1112011-02-24  Pavel Feldman  <pfeldman@chromium.org>
    212

  • trunk/LayoutTests/http/tests/navigation/useragent-expected.txt

    r79396 r79589  
    11Tests for user agent string template
    22
    3 UserAgent should match the Mozilla/5.0 (%Platform%; U; %Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) template: true
     3UserAgent should match the Mozilla/5.0 (%Platform%; %Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) template: true
    44UserAgent should be the same as the appVersion with appCodeName prefix: true
    55HTTP User-Agent header should be the same as userAgent: true

  • trunk/LayoutTests/http/tests/navigation/useragent.php

    r79396 r79589  
    1212
    1313    // Validate the user agent string using the following template:
    14     var userAgentTemplate = "Mozilla/5.0 (%Platform%; U; %Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko)"
    15     var userAgentTemplateRegExp = /^Mozilla\/5\.0 \(.+; U; [^;]+\) AppleWebKit\/[0-9\.]+(\+)? \(KHTML, like Gecko\).*$/;
     14    var userAgentTemplate = "Mozilla/5.0 (%Platform%; %Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko)"
     15    var userAgentTemplateRegExp = /^Mozilla\/5\.0 \(.+; [^;]+\) AppleWebKit\/[0-9\.]+(\+)? \(KHTML, like Gecko\).*$/;
    1616    document.write("UserAgent should match the " + userAgentTemplate + " template: " + !!userAgent.match(userAgentTemplateRegExp) + "<br>");
    1717

  • trunk/Source/WebKit/ChangeLog

    r79396 r79589  
     12011-02-24  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Drop the "U; " encryption level from the User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54566
     7
     8        * StringsNotToBeLocalized.txt:
     9
    1102011-02-22  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
    211

  • trunk/Source/WebKit/StringsNotToBeLocalized.txt

    r79396 r79589  
    270270"MoveWordRight"
    271271"MoveWordRightAndModifySelection"
    272 "Mozilla/5.0 (Macintosh; U; "
    273 "Mozilla/5.0 (Windows; U; "
     272"Mozilla/5.0 (Macintosh; "
     273"Mozilla/5.0 (Windows; "
    274274"MuteButton"
    275275"NP_GetEntryPoints"

  • trunk/Source/WebKit/efl/ChangeLog

    r79441 r79589  
     12011-02-24  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Drop the "U; " encryption level from the User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54566
     7
     8        * WebCoreSupport/FrameLoaderClientEfl.cpp:
     9        (WebCore::composeUserAgent):
     10        * ewk/ewk_settings.cpp:
     11        (ewk_settings_default_user_agent_get):
     12
    1132011-02-23  Patrick Gansterer  <paroga@webkit.org>
    214

  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

    r79396 r79589  
    118118    ua += " (";
    119119    ua += agentPlatform(); // Platform
    120     ua += "; U; "; // Security
     120    ua += "; ";
    121121    ua += agentOS(); // OS-or-CPU
    122122    ua += ") ";

  • trunk/Source/WebKit/efl/ewk/ewk_settings.cpp

    r79396 r79589  
    330330{
    331331    WTF::String ua_version = makeString(String::number(WEBKIT_USER_AGENT_MAJOR_VERSION), '.', String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+');
    332     WTF::String static_ua = makeString("Mozilla/5.0 (", _ewk_settings_webkit_platform_get(), "; U; ", _ewk_settings_webkit_os_version_get(), ") AppleWebKit/", ua_version) + makeString(" (KHTML, like Gecko) Version/5.0 Safari/", ua_version);
     332    WTF::String static_ua = makeString("Mozilla/5.0 (", _ewk_settings_webkit_platform_get(), "; ", _ewk_settings_webkit_os_version_get(), ") AppleWebKit/", ua_version) + makeString(" (KHTML, like Gecko) Version/5.0 Safari/", ua_version);
    333333
    334334    return eina_stringshare_add(static_ua.utf8().data());

  • trunk/Source/WebKit/gtk/ChangeLog

    r79586 r79589  
     12011-02-24  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Drop the "U; " encryption level from the User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54566
     7
     8        * webkit/webkitwebsettings.cpp:
     9        (webkitUserAgent):
     10
    1112011-02-24  Andrew Wilson  <atwilson@chromium.org>
    212

  • trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp

    r79396 r79589  
    223223
    224224    DEFINE_STATIC_LOCAL(const String, uaVersion, (makeString(String::number(WEBKIT_USER_AGENT_MAJOR_VERSION), '.', String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+')));
    225     DEFINE_STATIC_LOCAL(const String, staticUA, (makeString("Mozilla/5.0 (", webkitPlatform(), "; U; ", webkitOSVersion(), ") AppleWebKit/", uaVersion) +
     225    DEFINE_STATIC_LOCAL(const String, staticUA, (makeString("Mozilla/5.0 (", webkitPlatform(), "; ", webkitOSVersion(), ") AppleWebKit/", uaVersion) +
    226226                                                 makeString(" (KHTML, like Gecko) Version/5.0 Safari/", uaVersion)));
    227227

  • trunk/Source/WebKit/mac/ChangeLog

    r79586 r79589  
     12011-02-24  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Drop the "U; " encryption level from the User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54566
     7
     8        * WebView/WebView.mm:
     9        (+[WebView _standardUserAgentWithApplicationName:]):
     10
    1112011-02-24  Andrew Wilson  <atwilson@chromium.org>
    212

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r79396 r79589  
    549549        webKitVersion = createUserVisibleWebKitVersionString();
    550550    if ([applicationName length])
    551         return [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; " PROCESSOR " Mac OS X %@) AppleWebKit/%@ (KHTML, like Gecko) %@", osVersion, webKitVersion, applicationName];
    552     return [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; " PROCESSOR " Mac OS X %@) AppleWebKit/%@ (KHTML, like Gecko)", osVersion, webKitVersion];
     551        return [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; " PROCESSOR " Mac OS X %@) AppleWebKit/%@ (KHTML, like Gecko) %@", osVersion, webKitVersion, applicationName];
     552    return [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; " PROCESSOR " Mac OS X %@) AppleWebKit/%@ (KHTML, like Gecko)", osVersion, webKitVersion];
    553553}
    554554

  • trunk/Source/WebKit/qt/Api/qwebpage.cpp

    r79450 r79589  
    36843684    The default implementation returns the following value:
    36853685
    3686     "Mozilla/5.0 (%Platform%; %Security%; %Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) %AppVersion Safari/%WebKitVersion%"
     3686    "Mozilla/5.0 (%Platform%; %Security%%Subplatform%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) %AppVersion Safari/%WebKitVersion%"
    36873687
    36883688    On mobile platforms such as Symbian S60 and Maemo, "Mobile Safari" is used instead of "Safari".
    … …  
    36913691    \list
    36923692    \o %Platform% and %Subplatform% are expanded to the windowing system and the operation system.
    3693     \o %Security% expands to U if SSL is enabled, otherwise N. SSL is enabled if QSslSocket::supportsSsl() returns true.
     3693    \o %Security% expands to "N; " if SSL is disabled.
    36943694    \o %WebKitVersion% is the version of WebKit the application was compiled against.
    36953695    \o %AppVersion% expands to QCoreApplication::applicationName()/QCoreApplication::applicationVersion() if they're set; otherwise defaulting to Qt and the current Qt version.
    … …  
    37513751        firstPartTemp += QString::fromLatin1("; ");
    37523752
    3753         // SSL support
    3754 #if !defined(QT_NO_OPENSSL)
    3755         // we could check QSslSocket::supportsSsl() here, but this makes
    3756         // OpenSSL, certificates etc being loaded in all cases were QWebPage
    3757         // is used. This loading is not needed for non-https.
    3758         firstPartTemp += QString::fromLatin1("U; ");
    3759         // this may lead to a false positive: We indicate SSL since it is
    3760         // compiled in even though supportsSsl() might return false
    3761 #else
     3753#if defined(QT_NO_OPENSSL)
     3754        // No SSL support
    37623755        firstPartTemp += QString::fromLatin1("N; ");
    37633756#endif

  • trunk/Source/WebKit/qt/ChangeLog

    r79586 r79589  
     12011-02-24  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Drop the "U; " encryption level from the User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54566
     7
     8        * Api/qwebpage.cpp:
     9        (QWebPage::userAgentForUrl):
     10
    1112011-02-24  Andrew Wilson  <atwilson@chromium.org>
    212

  • trunk/Source/WebKit/win/ChangeLog

    r79586 r79589  
     12011-02-24  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Drop the "U; " encryption level from the User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54566
     7
     8        * WebView.cpp:
     9        (WebView::standardUserAgentWithApplicationName):
     10
    1112011-02-24  Andrew Wilson  <atwilson@chromium.org>
    212

  • trunk/Source/WebKit/win/WebView.cpp

    r79434 r79589  
    12451245{
    12461246    if (applicationName.isEmpty())
    1247         return makeString("Mozilla/5.0 (Windows; U; ", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko)");
    1248     return makeString("Mozilla/5.0 (Windows; U; ", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko) ", applicationName);
     1247        return makeString("Mozilla/5.0 (Windows; ", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko)");
     1248    return makeString("Mozilla/5.0 (Windows; ", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko) ", applicationName);
    12491249}
    12501250

  • trunk/Source/WebKit/wx/ChangeLog

    r79396 r79589  
     12011-02-24  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Drop the "U; " encryption level from the User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54566
     7
     8        * WebKitSupport/FrameLoaderClientWx.cpp:
     9        (WebCore::FrameLoaderClientWx::userAgent):
     10
    1112011-02-22  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
    212

  • trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

    r79396 r79589  
    534534{
    535535    // FIXME: Use the new APIs introduced by the GTK port to fill in these values.
    536     return String("Mozilla/5.0 (Macintosh; U; Intel Mac OS X) AppleWebKit/418.9.1 (KHTML, like Gecko) Safari/419.3");
     536    return String("Mozilla/5.0 (Macintosh; Intel Mac OS X) AppleWebKit/418.9.1 (KHTML, like Gecko) Safari/419.3");
    537537}
    538538

  • trunk/Source/WebKit2/ChangeLog

    r79586 r79589  
     12011-02-24  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Drop the "U; " encryption level from the User Agent string.
     6        https://bugs.webkit.org/show_bug.cgi?id=54566
     7
     8        * UIProcess/gtk/WebPageProxyGtk.cpp:
     9        (WebKit::WebPageProxy::standardUserAgent):
     10        * UIProcess/mac/WebPageProxyMac.mm:
     11        (WebKit::WebPageProxy::standardUserAgent):
     12        * UIProcess/qt/WebPageProxyQt.cpp:
     13        (WebKit::WebPageProxy::standardUserAgent):
     14        * UIProcess/win/WebPageProxyWin.cpp:
     15        (WebKit::WebPageProxy::standardUserAgent):
     16
    1172011-02-24  Andrew Wilson  <atwilson@chromium.org>
    218

  • trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp

    r79396 r79589  
    3333{
    3434    // FIXME: This should not be hard coded.
    35     return "Mozilla/5.0 (X11; U; Linux i686) AppleWebKit/534.7 (KHTML, like Gecko) Version/5.0 Safari/534.7";
     35    return "Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.7 (KHTML, like Gecko) Version/5.0 Safari/534.7";
    3636}
    3737

  • trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

    r79396 r79589  
    8989
    9090    if (applicationNameForUserAgent.isEmpty())
    91         return makeString("Mozilla/5.0 (Macintosh; U; " PROCESSOR " Mac OS X ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko)");
    92     return makeString("Mozilla/5.0 (Macintosh; U; " PROCESSOR " Mac OS X ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko) ", applicationNameForUserAgent);
     91        return makeString("Mozilla/5.0 (Macintosh; " PROCESSOR " Mac OS X ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko)");
     92    return makeString("Mozilla/5.0 (Macintosh; " PROCESSOR " Mac OS X ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko) ", applicationNameForUserAgent);
    9393}
    9494

  • trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp

    r79396 r79589  
    3232{
    3333    // FIXME: This should not be hard coded.
    34     return "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6) AppleWebKit/531.4 (KHTML, like Gecko) Version/4.0.3 Safari/531.4";
     34    return "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6) AppleWebKit/531.4 (KHTML, like Gecko) Version/4.0.3 Safari/531.4";
    3535}
    3636

  • trunk/Source/WebKit2/UIProcess/win/WebPageProxyWin.cpp

    r79396 r79589  
    104104
    105105    if (applicationNameForUserAgent.isEmpty())
    106         return makeString("Mozilla/5.0 (Windows; U; ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko)");
    107     return makeString("Mozilla/5.0 (Windows; U; ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko) ", applicationNameForUserAgent);
     106        return makeString("Mozilla/5.0 (Windows; ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko)");
     107    return makeString("Mozilla/5.0 (Windows; ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko) ", applicationNameForUserAgent);
    108108}
    109109
Note: See TracChangeset for help on using the changeset viewer.