fixed an issue with lowercase 'webobject name' tags

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1389 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 1be65e892ff057f0811f7231f5a5bd50b11968ad..b00e2c835da9a7587e2112a050ec6a88d24d664e 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-13  Helge Hess  <helge.hess@opengroupware.org>
+
+       * Templates/WOHTMLParser.m: fixed a bug with lowercase NAME tags in
+         wrapper templates (v4.5.259)
+
 2006-11-23  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
 
        * NGHttp: added DeltaV HTTP methods (v4.5.258)

diff --git a/sope-appserver/NGObjWeb/Templates/WOHTMLParser.m b/sope-appserver/NGObjWeb/Templates/WOHTMLParser.m
index 6fc89f4b2f01f9fe6218a03b21c2d9b1d51d43c2..201b55c0d74a595716cf034264108295dd2d35d0 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/WOHTMLParser.m
+++ b/sope-appserver/NGObjWeb/Templates/WOHTMLParser.m
@@ -636,11 +636,20 @@ _parseTagAttributes(NSZone *_zone, const unichar *_buffer,
     _skipSpaces(_buffer, _idx, _len);
     if (*_idx >= _len) break; // EOF
 
-    // read key
+    /* read tag key (eg NAME) */
     key = _parseStringValue(_zone, _buffer, _idx, _len, _exception, self);
-    if (key == nil) // ended
+    if (key == nil) // EOF
       break;
 
+    /* fixup NAME attribute, the only one where case matters */
+    
+    if ([key length] == 4) {
+      if ([@"name" caseInsensitiveCompare:key] == NSOrderedSame) {
+       [key release];
+       key = @"NAME";
+      }
+    }
+    
     /* The following parses:  space* '=' space* */
 
     _skipSpaces(_buffer, _idx, _len);

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index e82fe951939acd9b52f78e3949026f1d19915e9c..ab4142c726fe1461a133883ea1f3a671896a1e2f 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -3,7 +3,7 @@
 ifeq ($(GNUSTEP_HOST_VENDOR),apple) # linker overflow
 SUBMINOR_VERSION:=255
 else
-SUBMINOR_VERSION:=258
+SUBMINOR_VERSION:=259
 endif
 
 # v4.5.234 requires libDOM          v4.5.21