[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 bd7c92673e21939296416ba37ddf8616a15c6510
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 16 09:20:27 2002 +0000

    	Sigh. Amazingly enough, all other browsers seem to treat
    	stray </p>s as <p></p> (Mac IE treats it as <br>, but
    	I'm going with the WinIE/Gecko behavior of <p></p>).
    
    	This fixes bug 3063699.
    
            * khtml/html/htmlparser.cpp:
            (KHTMLParser::processCloseTag):
            (KHTMLParser::popBlock):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2708 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1b83b3c..5cd1b5a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
+	Sigh. Amazingly enough, all other browsers seem to treat
+	stray </p>s as <p></p> (Mac IE treats it as <br>, but
+	I'm going with the WinIE/Gecko behavior of <p></p>).
+
+	This fixes bug 3063699.
+	
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::processCloseTag):
+        (KHTMLParser::popBlock):
+
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
 	Fix for livepage.apple.com slowness.  Ensure that 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1b83b3c..5cd1b5a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
+	Sigh. Amazingly enough, all other browsers seem to treat
+	stray </p>s as <p></p> (Mac IE treats it as <br>, but
+	I'm going with the WinIE/Gecko behavior of <p></p>).
+
+	This fixes bug 3063699.
+	
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::processCloseTag):
+        (KHTMLParser::popBlock):
+
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
 	Fix for livepage.apple.com slowness.  Ensure that 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1b83b3c..5cd1b5a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
+	Sigh. Amazingly enough, all other browsers seem to treat
+	stray </p>s as <p></p> (Mac IE treats it as <br>, but
+	I'm going with the WinIE/Gecko behavior of <p></p>).
+
+	This fixes bug 3063699.
+	
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::processCloseTag):
+        (KHTMLParser::popBlock):
+
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
 	Fix for livepage.apple.com slowness.  Ensure that 
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index a886705..211d1ba 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -1158,7 +1158,16 @@ void KHTMLParser::processCloseTag(Token *t)
         child = child->nextSibling();
     }
 #endif
+    HTMLStackElem* oldElem = blockStack;
     popBlock(t->id-ID_CLOSE_TAG);
+    if (oldElem == blockStack && t->id == ID_P+ID_CLOSE_TAG) {
+        // We encountered a stray </p>.  Amazingly Gecko, WinIE, and MacIE all treat
+        // this as a valid break, i.e., <p></p>.  So go ahead and make the empty
+        // paragraph.
+        t->id-=ID_CLOSE_TAG;
+        parseToken(t);
+        popBlock(ID_P);
+    }
 #ifdef PARSER_DEBUG
     kdDebug( 6035 ) << "closeTag --> current = " << current->nodeName().string() << endl;
 #endif
@@ -1176,6 +1185,7 @@ void KHTMLParser::pushBlock(int _id, int _level)
 void KHTMLParser::popBlock( int _id )
 {
     HTMLStackElem *Elem = blockStack;
+    
     int maxLevel = 0;
 
 #ifdef PARSER_DEBUG

-- 
WebKit Debian packaging