[SCM] WebKit Debian packaging branch, webkit-1.2, updated. 1.2.5-1500-gb65db3c

[Huzaifa Sidhpurwala]

The following commit has been merged in the webkit-1.2 branch:
commit 5d77549dc9e52f7096860b02b409ab8b58de6264
Author: Huzaifa Sidhpurwala <huzaifas at redhat.com>
Date:   Thu Dec 2 13:17:36 2010 +0530

    Backport crash fix by Huzaifa Sidhpurwala <huzaifas at redhat.com>
    
        2010-07-17  TJ Lee  <tjlee0909 at gmail.com>
    
                Reviewed by Timothy Hatcher.
    
                HTMLLinkElement ignores dnsPrefetchingEnabled setting
                https://bugs.webkit.org/show_bug.cgi?id=42500
    
                Changed the HTML Link tag to check that the browser
                has DNS-prefetching enabled before calling ResourceHandle::prepareForURL.
    
                There are no test cases for this patch because it was unclear how to test
                this using a layout test. A possible test case would be to
                clear the DNS cache on the client's machine before loading a page with
                <link rel="dns-prefetch" href="SomeSiteThatsNotTheCurrentOne.com"> and
                then check the number of DNS cache entries.
    
                * html/HTMLLinkElement.cpp:
                (WebCore::HTMLLinkElement::process):
    
        git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63622 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index 88213d1..e8ed41e 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -182,7 +182,7 @@ void HTMLLinkElement::process()
     if (m_isIcon && m_url.isValid() && !m_url.isEmpty())
         document()->setIconURL(m_url.string(), type);
 
-    if (m_isDNSPrefetch && m_url.isValid() && !m_url.isEmpty())
+    if (m_isDNSPrefetch && document()->isDNSPrefetchEnabled() && m_url.isValid() && !m_url.isEmpty())
         prefetchDNS(m_url.host());
 
     bool acceptIfTypeContainsTextCSS = document()->page() && document()->page()->settings() && document()->page()->settings()->treatsAnyTextCSSLinkAsStylesheet();

-- 
WebKit Debian packaging