Package: release.debian.org Severity: normal User: [email protected] Usertags: pu
Hey, I'm planning to upload the attached change to stable. It's a very simple change with a rather big benefit to webkit users (fixes #578019). Let me know if it's OK to go forward. Cheers, -- Gustavo Noronha Silva <[email protected]> Debian Project
diff --git a/debian/changelog b/debian/changelog index 68e031a..353f4ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +webkit (1.2.7-0+squeeze2) stable; urgency=low + + [ Gustavo Noronha Silva ] + * debian/patches/06-fix-null-dns-lookups.patch: + - Avoid doing lots of needless NULL DNS lookups, thanks to Michael + Gratton <[email protected]> for the patch and Simon Paillard + <[email protected]> for the investigation (Closes: #578019) + + -- Gustavo Noronha Silva <[email protected]> Sat, 09 Apr 2011 10:02:05 -0300 + webkit (1.2.7-0+squeeze1) stable-security; urgency=high * Import new upstream security release: diff --git a/debian/patches/06-fix-null-dns-lookups.patch b/debian/patches/06-fix-null-dns-lookups.patch new file mode 100644 index 0000000..f172490 --- /dev/null +++ b/debian/patches/06-fix-null-dns-lookups.patch @@ -0,0 +1,11 @@ +--- WebCore/platform/network/soup/DNSSoup.cpp-orig 2010-04-29 01:26:06.048725419 +1000 ++++ WebCore/platform/network/soup/DNSSoup.cpp 2010-04-29 14:28:55.731471025 +1000 +@@ -36,6 +36,8 @@ + void prefetchDNS(const String& hostname) + { + #ifdef HAVE_LIBSOUP_2_29_90 ++ if (hostname.isEmpty()) ++ return; + String uri = "http://"+hostname; + GOwnPtr<SoupURI> soupURI(soup_uri_new(uri.utf8().data())); + // We may get invalid hostnames, so NULL-check here. diff --git a/debian/patches/series b/debian/patches/series index 48f3b50..2d94e25 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,7 @@ 02-pool-fixup-and-sparc-support.patch 04-spoof-user-agent-to-google.patch 05-fix-jit-on-kfreebsd-i386.patch +06-fix-null-dns-lookups.patch cve-2010-2646.patch cve-2010-2651.patch cve-2010-2900.patch
