[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 3335886c7bc6242320f00dfd58d8d419361570dd
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 5 19:35:22 2002 +0000

    	Fix for this bug:
    
    	Radar 3092747 (javascript cookieEnabled property returns incorrect value)
    
    	Now, we return "true" for navigator.cookieEnabled when
    	"Only accept cookies from the same domain as the current page" option
    	is selected is user preferences.
    
            * WebCoreSupport.subproj/WebCookieAdapter.m:
            (-[WebCookieAdapter cookiesEnabled])
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cb059c5..05250ba 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-11-05  Ken Kocienda  <kocienda at apple.com>
+
+	Fix for this bug:
+
+	Radar 3092747 (javascript cookieEnabled property returns incorrect value)
+
+	Now, we return "true" for navigator.cookieEnabled when 
+	"Only accept cookies from the same domain as the current page" option
+	is selected is user preferences.
+
+        * WebCoreSupport.subproj/WebCookieAdapter.m:
+        (-[WebCookieAdapter cookiesEnabled])
+
 2002-11-05  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3091271 -- missing plug-in icon is on white
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index cb059c5..05250ba 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-11-05  Ken Kocienda  <kocienda at apple.com>
+
+	Fix for this bug:
+
+	Radar 3092747 (javascript cookieEnabled property returns incorrect value)
+
+	Now, we return "true" for navigator.cookieEnabled when 
+	"Only accept cookies from the same domain as the current page" option
+	is selected is user preferences.
+
+        * WebCoreSupport.subproj/WebCookieAdapter.m:
+        (-[WebCookieAdapter cookiesEnabled])
+
 2002-11-05  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3091271 -- missing plug-in icon is on white
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index 3a5098b..714c2f8 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -26,8 +26,9 @@
 {
     BOOL result;
 
-    result = ([[WebCookieManager sharedCookieManager] acceptPolicy] == WebCookieAcceptPolicyAlways);
-
+    WebCookieAcceptPolicy acceptPolicy = [[WebCookieManager sharedCookieManager] acceptPolicy];
+    result = (acceptPolicy == WebCookieAcceptPolicyAlways || acceptPolicy == WebCookieAcceptPolicyOnlyFromMainDocumentDomain);
+    
     return result;
 }
 

-- 
WebKit Debian packaging