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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit c1e46f028ec7d77b8bcddd193720ec5b1a990c33
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 18 13:41:07 2002 +0000

    	- fixed 3103711 - Alexander does not complete JavaScript iBench
    
            * khtml/ecma/kjs_html.cpp:
            (KJS::HTMLDocument::putValue): Resolve URL for location property
    	relative to the base URL of the frame where the JavaScript is
    	executing, not the target frame.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2729 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c901379..6256e35 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-11-18  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3103711 - Alexander does not complete JavaScript iBench
+	
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLDocument::putValue): Resolve URL for location property
+	relative to the base URL of the frame where the JavaScript is
+	executing, not the target frame.
+
 2002-11-18  David Hyatt  <hyatt at apple.com>
 
 	Yay! Found the main cause of :hover feedback being so
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c901379..6256e35 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-11-18  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3103711 - Alexander does not complete JavaScript iBench
+	
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLDocument::putValue): Resolve URL for location property
+	relative to the base URL of the frame where the JavaScript is
+	executing, not the target frame.
+
 2002-11-18  David Hyatt  <hyatt at apple.com>
 
 	Yay! Found the main cause of :hover feedback being so
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c901379..6256e35 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-11-18  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3103711 - Alexander does not complete JavaScript iBench
+	
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLDocument::putValue): Resolve URL for location property
+	relative to the base URL of the frame where the JavaScript is
+	executing, not the target frame.
+
 2002-11-18  David Hyatt  <hyatt at apple.com>
 
 	Yay! Found the main cause of :hover feedback being so
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index 6e6ae12..2c58de6 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -304,6 +304,16 @@ void KJS::HTMLDocument::putValue(ExecState *exec, int token, const Value& value,
     {
       KHTMLPart *part = view->part();
       QString str = value.toString(exec).qstring();
+
+      // When assinging location, IE and Mozilla both resolve the URL
+      // relative to the frame where the JavaScript is executing not
+      // the target frame.
+      KHTMLPart *activePart = static_cast<KJS::ScriptInterpreter *>( exec->interpreter() )->part();
+      if (activePart) {
+       KURL resolvedURL(activePart->baseURL(), str);
+       str = resolvedURL.url();
+      }
+
       part->scheduleRedirection(0, str);
     }
     break;

-- 
WebKit Debian packaging