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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 8c5382754b02e13fff474966630539bcfe66bde1
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 28 08:14:20 2003 +0000

    	Fix for 3398463, a regression caused by an unintended line movement.
    	<br/> was no longer being treated just like <br> in HTML.
    
            Reviewed by gramps
    
            * khtml/html/htmltokenizer.cpp:
            (HTMLTokenizer::parseTag):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4911 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d2b3636..bfe5a1a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-08-28  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3398463, a regression caused by an unintended line movement.
+	<br/> was no longer being treated just like <br> in HTML.
+	
+        Reviewed by gramps
+
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
 === Safari-95 ===
 
 2003-08-27  Richard Williamson   <rjw at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d2b3636..bfe5a1a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-08-28  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3398463, a regression caused by an unintended line movement.
+	<br/> was no longer being treated just like <br> in HTML.
+	
+        Reviewed by gramps
+
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
 === Safari-95 ===
 
 2003-08-27  Richard Williamson   <rjw at apple.com>
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index e0f317d..cea3892 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -936,12 +936,14 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
                     // Start Tag
                     beginTag = true;
 
-                uint tagID = khtml::getTagID(ptr, len);
-                
-                // Accept empty xml tags like <br/>
+                // Accept empty xml tags like <br/>.  We trim off the "/" so that when we call
+                // getTagID, we'll look up "br" as the tag name and not "br/".
                 if(len > 1 && ptr[len-1] == '/' )
                     ptr[--len] = '\0';
-                
+
+                // Look up the tagID for the specified tag name (now that we've shaved off any
+                // invalid / that might have followed the name).
+                uint tagID = khtml::getTagID(ptr, len);
                 if (!tagID) {
 #ifdef TOKEN_DEBUG
                     QCString tmp(ptr, len+1);

-- 
WebKit Debian packaging