[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jhoneycutt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit d2c5350bd8e06c96022e07fd1b2fd57115746e9f
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 22:21:56 2010 +0000

    Prevent an assertion failure when trying to create a protection space
    for file/data URLs.
    
    Reviewed by Sam Weinig.
    
    * WebURLProtectionSpace.cpp:
    (WebURLProtectionSpace::initWithHost):
    Remove the ASSERT_NOT_REACHED().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69152 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 9fae06d..e80714a 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-04  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        Prevent an assertion failure when trying to create a protection space
+        for file/data URLs.
+
+        Reviewed by Sam Weinig.
+
+        * WebURLProtectionSpace.cpp:
+        (WebURLProtectionSpace::initWithHost):
+        Remove the ASSERT_NOT_REACHED().
+
 2010-10-05  Brent Fulgham  <bfulgham at webkit.org>
 
         Unreviewed build correction.
diff --git a/WebKit/win/WebURLProtectionSpace.cpp b/WebKit/win/WebURLProtectionSpace.cpp
index c3d78bb..6086abb 100644
--- a/WebKit/win/WebURLProtectionSpace.cpp
+++ b/WebKit/win/WebURLProtectionSpace.cpp
@@ -166,8 +166,6 @@ HRESULT STDMETHODCALLTYPE WebURLProtectionSpace::initWithHost(
         serverType = ProtectionSpaceServerFTP;
     else if (BString(protocol) == webURLProtectionSpaceFTPSBString)
         serverType = ProtectionSpaceServerFTPS;
-    else
-        ASSERT_NOT_REACHED();
 
     m_protectionSpace = ProtectionSpace(String(host, SysStringLen(host)), port, serverType, 
         String(realm, SysStringLen(realm)), coreScheme(authenticationMethod));

-- 
WebKit Debian packaging