* GSWeb.framework/GSWApplication.m (GSWApplicationMainReal):

Remove assertion for defined GNUSTEP_STRING_ENCODING.
        * GSWeb.framework/GSWDefaultAdaptorThread.m
        ([+sendResponse:toStream:
        withNamingConv:withAdditionalHeaderLines:withRemoteAddress:]):
        Use contentEncoding of response instead of
        NSISOLatin1StringEncoding.
        * GSWeb.framework/GSWHTMLComment.m ([-init]): Use
        +[GSWMessage defaultEncoding] instead of
        NSISOLatin1StringEncoding.
        * GSWeb.framework/GSWHTMLDynamicElement.m
        ([-addURL:forCIDKeyAssociation:CIDStoreAssociation:inContext:]):
        Use NSUnicodeStringEncoding instead NSISOLatin1StringEncoding
        for hash value.
        * GSWeb.framework/GSWMessage.m ([+initialize]): Set
        globalDefaultEncoding to NSISOLatin1StringEncoding only if
        WOStrictFlag default flag is set.  Otherwise default to
        GetDefEncoding().
        * GSWeb.framework/GSWRequest.m
        ([-_formValueEncodingFromFormData:]): Use +[GSWMessage
        defaultEncoding] instead of NSISOLatin1StringEncoding.
        ([-_formData], [-_getFormValuesFromMultipartFormDataOld]):
        Ditto.
        ([-_getFormValuesFromMultipartFormData]): Ditto.
        ([-_decodeMultipartBody:boundary:], -[_parseData:]): Ditto.
        * GSWeb.framework/GSWTemplateParserXML.m
        ([-templateElements]): Ditto.
        * GSWeb.framework/NSString+HTML.m (-[decodeURL]): Ditto.

        * INSTALL: Remove reference to GNUSTEP_STRING_ENCODING.
        * Examples/hello/HelloPage.gswc/HelloPage.gswi,
        * GSWExtensions.framework/French.lproj/
        GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi,
        GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi
        * GSWExtensions.framework/
        GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswi
        GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswi,
        GSWIFrame.gswc/GSWIFrame.gswi,
        GSWMetaRefresh.gswc/GSWMetaRefresh.gswi,
        GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswi,
        GSWRedirect.gswc/GSWRedirect.gswi,
        GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi,
        GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi
        GSWStatsPage.gswc/GSWStatsPage.gswi,
        GSWTable.gswc/GSWTable.gswi,
        GSWTableString.gswc/GSWTableString.gswi,
        Correct encoding declaration.

        * GSWExtensions.framework/
        GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswd,
        GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswi,
        GSWKeyValueConditional.gswc/GSWKeyValueConditional.html:
        Correct encoding declaration and line terminators.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@20347 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,56 @@
+2004-11-12  David Ayers  <d.ayers@inode.at>
+
+	* GSWeb.framework/GSWApplication.m (GSWApplicationMainReal):
+	Remove assertion for defined GNUSTEP_STRING_ENCODING.
+	* GSWeb.framework/GSWDefaultAdaptorThread.m ([+sendResponse:toStream:
+	withNamingConv:withAdditionalHeaderLines:withRemoteAddress:]):
+	Use contentEncoding of response instead of
+	NSISOLatin1StringEncoding.
+	* GSWeb.framework/GSWHTMLComment.m ([-init]): Use 
+	+[GSWMessage defaultEncoding] instead of
+	NSISOLatin1StringEncoding.
+	* GSWeb.framework/GSWHTMLDynamicElement.m
+	([-addURL:forCIDKeyAssociation:CIDStoreAssociation:inContext:]):
+	Use NSUnicodeStringEncoding instead NSISOLatin1StringEncoding for
+	hash value.
+	* GSWeb.framework/GSWMessage.m ([+initialize]): Set
+	globalDefaultEncoding to NSISOLatin1StringEncoding only if
+	WOStrictFlag default flag is set.  Otherwise default to
+	GetDefEncoding().
+	* GSWeb.framework/GSWRequest.m
+	([-_formValueEncodingFromFormData:]): Use +[GSWMessage
+	defaultEncoding] instead of NSISOLatin1StringEncoding.
+	([-_formData], [-_getFormValuesFromMultipartFormDataOld]): Ditto.
+	([-_getFormValuesFromMultipartFormData]): Ditto.
+	([-_decodeMultipartBody:boundary:], -[_parseData:]): Ditto.
+	* GSWeb.framework/GSWTemplateParserXML.m ([-templateElements]): Ditto.
+	* GSWeb.framework/NSString+HTML.m (-[decodeURL]): Ditto.
+
+	* INSTALL: Remove reference to GNUSTEP_STRING_ENCODING.
+	* Examples/hello/HelloPage.gswc/HelloPage.gswi,
+	* GSWExtensions.framework/French.lproj/
+	GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi,
+	GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi
+	* GSWExtensions.framework/
+	GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswi
+	GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswi,
+	GSWIFrame.gswc/GSWIFrame.gswi,
+	GSWMetaRefresh.gswc/GSWMetaRefresh.gswi,
+	GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswi,
+	GSWRedirect.gswc/GSWRedirect.gswi,
+	GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi,
+	GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi
+	GSWStatsPage.gswc/GSWStatsPage.gswi,
+	GSWTable.gswc/GSWTable.gswi,
+	GSWTableString.gswc/GSWTableString.gswi,
+	Correct encoding declaration.
+
+	* GSWExtensions.framework/
+	GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswd,
+	GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswi,
+	GSWKeyValueConditional.gswc/GSWKeyValueConditional.html:
+	Correct encoding declaration and line terminators.
+	
 2004-11-08  Manuel Guesdon <mguesdon@orange-concept.com>
 	* GSWAdaptors/Apache/mod_gsweb.c: change in 
 		GSWHTTPResponse_BuildErrorResponse call for templates

Examples/hello/HelloPage.gswc/HelloPage.gswi

@@ -1,4 +1,4 @@
 {
-	encoding = NSISOLatin1StringEncoding;
+	encoding = NSUTF8StringEncoding;
 	variables = {};
 }

GNUmakefile

@@ -33,7 +33,10 @@ include ./config.mak
 #
 # The list of subproject directories
 #
-SUBPROJECTS = GSWeb.framework GSWExtensions.framework GSWExtensionsGSW.framework 
+SUBPROJECTS = GSWeb.framework \
+	GSWExtensions.framework \
+	GSWExtensionsGSW.framework \
+
 #GSWAdaptors
 
 -include Makefile.preamble

GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWIFrame.gswc/GSWIFrame.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswd

@@ -1,8 +1,8 @@
-
+
-Conditional: GSWConditional {
+Conditional: GSWConditional {
-	condition = condition;
+	condition = condition;
-	negate = ^negate;
+	negate = ^negate;
-}
+}
-
+
-Content: GSWComponentContent {
+Content: GSWComponentContent {
-}
+}

GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswi

@@ -1,4 +1,4 @@
-{
+{
-	encoding = NSISOLatin1StringEncoding;
+	encoding = NSUTF8StringEncoding;
-	variables = {};
+	variables = {};
-}
+}

GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.html

@@ -1 +1 @@
-<gsweb name=Conditional><gsweb name=Content></gsweb></gsweb>
+<gsweb name=Conditional><gsweb name=Content></gsweb></gsweb>

GSWExtensions.framework/GSWMetaRefresh.gswc/GSWMetaRefresh.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWRedirect.gswc/GSWRedirect.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWTable.gswc/GSWTable.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWExtensions.framework/GSWTableString.gswc/GSWTableString.gswi

@@ -1,4 +1,4 @@
 {
 	"GSWeb Version" = "1.0"; 
-	encoding = NSISOLatin1StringEncoding; 
+	encoding = NSUTF8StringEncoding; 
 }

GSWeb.framework/GSWApplication.m

@@ -102,8 +102,6 @@ int GSWApplicationMainReal(NSString* applicationClassName,
 //call NSBundle Start:_usesFastJavaBundleSetup
 //call :NSBundle Start:_setUsesFastJavaBundleSetup:YES
 //call NSBundle mainBundle
-  NSProcessInfo* processInfo=nil;
-  NSString* envGNUstepStringEncoding=nil;
   NSAutoreleasePool *appAutoreleasePool=nil;
 
   appAutoreleasePool = [NSAutoreleasePool new];
@@ -113,18 +111,6 @@ int GSWApplicationMainReal(NSString* applicationClassName,
   DebugInstall("/dvlp/projects/app/Source/app.gswa/shared_debug_obj/ix86/linux-gnu/gnu-gnu-gnu-xgps/app_server");
   DebugEnableBreakpoints();
   */
-  processInfo=[NSProcessInfo processInfo];
-  envGNUstepStringEncoding=[[processInfo environment]
-                             objectForKey:@"GNUSTEP_STRING_ENCODING"];
-  NSCAssert(envGNUstepStringEncoding,
-            @"GNUSTEP_STRING_ENCODING environement variable is not defined !");
-  NSCAssert([NSString defaultCStringEncoding]!=NSASCIIStringEncoding,
-            @"NSString defaultCStringEncoding is NSASCIIStringEncoding. Please define GNUSTEP_STRING_ENCODING environement variable to better one !");
-  if (!envGNUstepStringEncoding
-      || [NSString defaultCStringEncoding]==NSASCIIStringEncoding)
-    {
-      result=-1;
-    };
   if (result>=0)
     {
       GSWeb_AdjustVolatileNSArgumentDomain();

GSWeb.framework/GSWDefaultAdaptorThread.m

@@ -756,7 +756,7 @@ withAdditionalHeaderLines:(NSArray*)addHeaders
                              autorelease]);
           NSDebugDeepMLLog(@"low",@"Response content String :%@",
                            [[[NSString alloc] initWithData:[response content]
-                                              encoding:NSISOLatin1StringEncoding]
+                                              encoding:[response contentEncoding]]
                              autorelease]);
 
           NS_DURING

GSWeb.framework/GSWHTMLComment.m

@@ -41,7 +41,7 @@ RCS_ID("$Id$")
 {
   if ((self=[super init]))
     {
-      _encoding=NSISOLatin1StringEncoding;
+      _encoding = [GSWMessage defaultEncoding];
     };
   return self;
 };

GSWeb.framework/GSWHTMLDynamicElement.m

@@ -1027,7 +1027,7 @@ CIDStoreAssociation:(GSWAssociation*)cidStore
         {
           // We calculate cidKeyValue by computing md5 on url
           // so there will be no duplicate elements with different keys
-	  NSData* data = [url dataUsingEncoding: NSISOLatin1StringEncoding];
+	  NSData* data = [url dataUsingEncoding: NSUnicodeStringEncoding];
 	  cidKeyValue=[[data md5Digest] hexadecimalRepresentation];
         };
       newURL=[self addCIDElement:[NSDictionary dictionaryWithObject:url
@@ -1091,7 +1091,7 @@ CIDStoreAssociation:(GSWAssociation*)cidStore
         {
           // We calculate cidKeyValue by computing md5 on path
           // so there will be no duplicate elements with different keys
-	  NSData* data = [path dataUsingEncoding: NSISOLatin1StringEncoding];
+	  NSData* data = [path dataUsingEncoding: NSUnicodeStringEncoding];
 	  cidKeyValue=[[data md5Digest] hexadecimalRepresentation];
         };
 

GSWeb.framework/GSWMessage.m

@@ -32,10 +32,12 @@
 
 RCS_ID("$Id$")
 
+#include <GNUstepBase/Unicode.h>
 #include "GSWeb.h"
 #include "NSData+Compress.h"
 
-static NSStringEncoding globalDefaultEncoding=NSISOLatin1StringEncoding;
+
+static NSStringEncoding globalDefaultEncoding=GSUndefinedEncoding;
 static NSString* globalDefaultURLEncoding=nil;
 
 static SEL appendStringSel = NULL;
@@ -72,6 +74,8 @@ static SEL appendDataSel = NULL;
     {
       appendStringSel = @selector(appendString:);
       appendDataSel = @selector(appendData:);
+      globalDefaultEncoding = WOStrictFlag 
+	? NSISOLatin1StringEncoding : GetDefEncoding() ;
     };
 };
 

GSWeb.framework/GSWRequest.m

@@ -1353,7 +1353,7 @@ RCS_ID("$Id$")
 //--------------------------------------------------------------------
 -(NSStringEncoding)_formValueEncodingFromFormData:(NSData*)aFormData
 {
-  return NSISOLatin1StringEncoding; //TODO
+  return [[self class] defaultEncoding]; //TODO
 };
 
 //--------------------------------------------------------------------
@@ -1367,7 +1367,7 @@ RCS_ID("$Id$")
   if ([_method isEqualToString:GSWHTTPHeader_MethodGet])
     {
       NSString* urlQueryString=[self _urlQueryString];
-      data=[urlQueryString dataUsingEncoding:NSISOLatin1StringEncoding];//??
+      data=[urlQueryString dataUsingEncoding: [self formValueEncoding]];//??
       NSDebugMLLog(@"requests",@"data=%@",data);
     }
   else if ([_method isEqualToString:GSWHTTPHeader_MethodPost])
@@ -1747,7 +1747,7 @@ RCS_ID("$Id$")
                               value=[values objectAtIndex:valueIndex];
                               NSDebugMLLog(@"requests",@"value=%@",value);
                               value=[[[NSString alloc]initWithData:value
-                                                      encoding:NSISOLatin1StringEncoding]autorelease];
+                                                      encoding:[self formValueEncoding]]autorelease];
                               [valuesNew addObject:value];
                             };
                           values=[NSArray arrayWithArray:valuesNew];
@@ -1820,7 +1820,7 @@ RCS_ID("$Id$")
   [headersString appendString:@"\n"];
   NSDebugMLLog(@"requests",@"headersString=[\n%@\n]",headersString);
 
-  headersData=[headersString dataUsingEncoding:NSISOLatin1StringEncoding];
+  headersData=[headersString dataUsingEncoding:[self formValueEncoding]];
   parser=[GSMimeParser mimeParser];
   [parser parse:headersData];
   [parser expectNoHeaders];
@@ -1960,12 +1960,12 @@ RCS_ID("$Id$")
   NSDebugMLLog(@"requests",@"aBoundary=%@",aBoundary);
   boundaryString=[NSString stringWithFormat:@"--%@\r\n",aBoundary];//Add "--" and "\r\n"
   NSDebugMLLog(@"requests",@"aBoundary=%@",aBoundary);
-  dataBoundary=[boundaryString dataUsingEncoding:NSISOLatin1StringEncoding];//TODO
+  dataBoundary=[boundaryString dataUsingEncoding:[self formValueEncoding]];//TODO
   NSDebugMLLog(@"requests",@"dataBoundary=%@",dataBoundary);
 /*  {
 	NSString* _dataString=nil;
 	_dataString=[[[NSString alloc]initWithData:_body
-								  encoding:NSISOLatin1StringEncoding]autorelease];
+					  encoding:[self formValueEncoding]]autorelease];
 	NSDebugMLLog(@"requests",@"_bodyString=%@",_dataString);
   }
 */
@@ -1980,7 +1980,7 @@ RCS_ID("$Id$")
           {
             NSString* _dataString=nil;
             _dataString=[[[NSString alloc]initWithData:tmpData
-                                          encoding:NSISOLatin1StringEncoding]autorelease];
+                                          encoding:[self formValueEncoding]]autorelease];
             NSDebugMLLog(@"requests",@"_tmpDataString=[\n%@\n]",_dataString);
           }
         else
@@ -2004,7 +2004,7 @@ RCS_ID("$Id$")
           //Delete the last \r\nseparator--\r\n
           boundaryString=[NSString stringWithFormat:@"\r\n%@--\r\n",aBoundary];
           NSDebugMLLog(@"requests",@"aBoundary=%@",aBoundary);
-          dataBoundary=[boundaryString dataUsingEncoding:NSISOLatin1StringEncoding];//TODO
+          dataBoundary=[boundaryString dataUsingEncoding:[self formValueEncoding]];//TODO
           NSDebugMLLog(@"requests",@"tmpData_=%@",tmpData);
           tmpData=[tmpData dataByDeletingLastBytesCount:[dataBoundary length]];
           NSDebugMLLog(@"requests",@"tmpData=%@",tmpData);
@@ -2024,7 +2024,7 @@ RCS_ID("$Id$")
           {
             NSString* dataString=nil;
             dataString=[[[NSString alloc]initWithData:tmpData
-                                         encoding:NSISOLatin1StringEncoding]autorelease];
+                                         encoding:[self formValueEncoding]]autorelease];
             NSDebugMLLog(@"requests",@"tmpDataString=[\n%@\n]",dataString);
 			
           }
@@ -2086,7 +2086,7 @@ RCS_ID("$Id$")
                   NSString* value=@"";
                   NSData* headerData=[aData subdataWithRange:NSMakeRange(start,i-start)];
                   NSString* tmpHeaderString=[[[NSString alloc]initWithData:headerData
-                                                              encoding:NSISOLatin1StringEncoding]autorelease];
+                                                              encoding:[self formValueEncoding]]autorelease];
                   NSDebugMLLog(@"requests",@"i=%d",i);
                   NSDebugMLLog(@"requests",@"start=%d",start);
                   NSDebugMLLog(@"requests",@"headerData=%@",headerData);

GSWeb.framework/GSWTemplateParserXML.m

@@ -649,7 +649,7 @@ static NSString* TabsForLevel(int level)
       NSStringEncoding stringEncoding=_stringEncoding;
 
       if (stringEncoding==GSUndefinedEncoding)
-        stringEncoding=NSISOLatin1StringEncoding;
+        stringEncoding=[GSWMessage defaultEncoding];
         
       sax=[GSWTemplateParserSAXHandler handlerWithTemplateParser:self];
       if ([self isKindOfClass:[GSWTemplateParserXMLHTML class]])

GSWeb.framework/NSString+HTML.m

@@ -262,7 +262,8 @@ initHtmlChars()
   temp=[NSString stringWithCharacters:unichars
                  length:uniCharsIndex];
   NSDebugMLLog(@"low",@"temp=%@",temp);
-  NSDebugMLLog(@"low",@"temp data=%@",[temp dataUsingEncoding:NSISOLatin1StringEncoding]);
+  NSDebugMLLog(@"low",@"temp data=%@",
+	       [temp dataUsingEncoding: [GSWMessage defaultEncoding]]);
   return temp;
 };
 

INSTALL

@@ -53,9 +53,6 @@ Installing `gsweb'
 
 At this point everything is done, still remains the Apache configuration:
 
-You have to export the following env var:
-export GNUSTEP_STRING_ENCODING=NSISOLatin1StringEncoding
-
 If you do not want the extensions you can compile with 
 ADDITIONAL_OBJCFLAGS += -DNOEXTENSIONS
 in config.mak