gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-04-23 15:33:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
David Ayers 2004-11-12 13:47:05 +00:00
parent ba53f7538a
commit c5ee2bd0bf
28 changed files with 106 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
ChangeLog
View file

@ -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

2
Examples/hello/HelloPage.gswc/HelloPage.gswi
View file

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

5
GNUmakefile
View file

@ -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

2
GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi
View file

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

2
GSWExtensions.framework/French.lproj/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi
View file

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

2
GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswi
View file

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

2
GSWExtensions.framework/GSWDictionaryRepetition.gswc/GSWDictionaryRepetition.gswi
View file

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

2
GSWExtensions.framework/GSWIFrame.gswc/GSWIFrame.gswi
View file

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

16
GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswd
View file

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

8
GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.gswi
View file

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

2
GSWExtensions.framework/GSWKeyValueConditional.gswc/GSWKeyValueConditional.html
View file

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

2
GSWExtensions.framework/GSWMetaRefresh.gswc/GSWMetaRefresh.gswi
View file

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

2
GSWExtensions.framework/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswi
View file

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

2
GSWExtensions.framework/GSWRedirect.gswc/GSWRedirect.gswi
View file

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

2
GSWExtensions.framework/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswi
View file

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

2
GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswi
View file

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

2
GSWExtensions.framework/GSWStatsPage.gswc/GSWStatsPage.gswi
View file

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

2
GSWExtensions.framework/GSWTable.gswc/GSWTable.gswi
View file

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

2
GSWExtensions.framework/GSWTableString.gswc/GSWTableString.gswi
View file

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

14
GSWeb.framework/GSWApplication.m
View file

@ -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();

2
GSWeb.framework/GSWDefaultAdaptorThread.m
View file

@ -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

2
GSWeb.framework/GSWHTMLComment.m
View file

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

4
GSWeb.framework/GSWHTMLDynamicElement.m
View file

@ -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];
};

6
GSWeb.framework/GSWMessage.m
View file

@ -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() ;
};
};

20
GSWeb.framework/GSWRequest.m
View file

@ -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);

2
GSWeb.framework/GSWTemplateParserXML.m
View file

@ -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]])

3
GSWeb.framework/NSString+HTML.m
View file

@ -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;
};

3
INSTALL
View file

@ -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