From 06a3bfbe2b6a36bd5d9d9b644623d55bbad17cb1 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 26 Jul 2005 11:50:58 +0000 Subject: [PATCH] added patches from #1495 (OpenBSD) changed form-handling for non-lF platforms git-svn-id: http://svn.opengroupware.org/SOPE/trunk@935 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 11 +++++++++++ sope-appserver/NGObjWeb/GNUmakefile.preamble | 4 ++++ sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m | 15 +++++++++++++++ sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/WOContext.m | 5 +++-- sope-appserver/SoOFS/ChangeLog | 4 ++++ sope-appserver/SoOFS/GNUmakefile.preamble | 4 ++++ sope-appserver/SoOFS/Version | 2 +- .../WOExtensions/WODictionaryRepetition.m | 3 ++- 9 files changed, 45 insertions(+), 5 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index df79cdfe..49528f74 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,14 @@ +2005-07-23 Sebastian Reitenbach + + * GNUmakefile.preamble: added OpenBSD linking flags (v4.5.179) + +2005-07-23 Helge Hess + + * WOContext.m: subminor code reformatting + + * NGHttp/NGUrlFormCoder.m: added some patch by Mont which changes + URL handling on non-libFoundation platforms + 2005-07-21 Helge Hess * SoObjects/WOContext+SoObjects.m: lookup SoUser using authenticator in diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble index 4ec44d07..3f67425d 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble @@ -85,3 +85,7 @@ wod_TOOL_LIBS += -lDOM -lSaxObjC -lFoundationExt wod_LDFLAGS += -framework Foundation libNGObjWeb_LIBRARIES_DEPEND_UPON += -lFoundationExt endif + +ifeq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3) +wod_TOOL_LIBS += -liconv +endif diff --git a/sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m b/sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m index 1fa0159f..2e90b8ba 100644 --- a/sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m +++ b/sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m @@ -22,6 +22,9 @@ #include "NGUrlFormCoder.h" #include "common.h" +// TODO: can we replace that with NSString+URLEscaping.m in NGExtensions? +// I think there was 'some' special thing + #if !LIB_FOUNDATION_LIBRARY static BOOL debugDecoding = NO; #endif @@ -82,6 +85,17 @@ static __inline__ NSString *urlStringFromBuffer(const unsigned char *buffer, #if LIB_FOUNDATION_LIBRARY return [[StrClass alloc] initWithCString:(char *)buffer length:len]; #else + // TODO: patch by Mont? We cannot assume NSUTF8StringEncoding?! + NSString *value; + + value = [[StrClass alloc] initWithBytes:buffer length:len + encoding:NSUTF8StringEncoding]; + if (debugDecoding) { + NSLog(@"decoded data len %d value (len=%d): %@", + len, [value length], value); + } + return value; +#if 0 register signed int i; unichar *s; NSString *value; @@ -98,6 +112,7 @@ static __inline__ NSString *urlStringFromBuffer(const unsigned char *buffer, } return value; #endif +#endif } NGHashMap *NGDecodeUrlFormParameters(const unsigned char *_buffer, diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index f162a058..9cc49c99 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=178 +SUBMINOR_VERSION:=179 # v4.5.122 requires libNGExtensions v4.5.153 # v4.5.91 requires libNGExtensions v4.5.134 diff --git a/sope-appserver/NGObjWeb/WOContext.m b/sope-appserver/NGObjWeb/WOContext.m index 67fbd173..6209859b 100644 --- a/sope-appserver/NGObjWeb/WOContext.m +++ b/sope-appserver/NGObjWeb/WOContext.m @@ -1005,8 +1005,9 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) { /* languages for resource lookup (non-WO) */ - (NSArray *)resourceLookupLanguages { - return [self hasSession] ? [[self session] languages] - : [[self request] browserLanguages]; + return [self hasSession] + ? [[self session] languages] + : [[self request] browserLanguages]; } diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog index 9bae37d0..89f6c91a 100644 --- a/sope-appserver/SoOFS/ChangeLog +++ b/sope-appserver/SoOFS/ChangeLog @@ -1,3 +1,7 @@ +2005-07-23 Sebastian Reitenbach + + * GNUmakefile.preamble: added OpenBSD linking flags (v4.5.17) + 2005-05-03 Helge Hess * GNUmakefile.preamble: added strict bundle dependencies for MacOSX diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble index 6184c0a2..857a7764 100644 --- a/sope-appserver/SoOFS/GNUmakefile.preamble +++ b/sope-appserver/SoOFS/GNUmakefile.preamble @@ -75,3 +75,7 @@ ifneq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin) sope_TOOL_LIBS += -lcrypt endif endif + +ifeq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3) +$(SOPED_NAME)_TOOL_LIBS += -liconv +endif diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version index 0a8bca08..3c3eedfd 100644 --- a/sope-appserver/SoOFS/Version +++ b/sope-appserver/SoOFS/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=16 +SUBMINOR_VERSION:=17 diff --git a/sope-appserver/WOExtensions/WODictionaryRepetition.m b/sope-appserver/WOExtensions/WODictionaryRepetition.m index 9809b005..413519a6 100644 --- a/sope-appserver/WOExtensions/WODictionaryRepetition.m +++ b/sope-appserver/WOExtensions/WODictionaryRepetition.m @@ -66,10 +66,11 @@ - (NSString *)escapeKey:(NSString *)_key { if ([_key rangeOfString:@"."].length == 0) return _key; - +#if 0 NSLog(@"WARNING(%s): key '%@' can't be processed by " @"WODictionaryRepetition !!", __PRETTY_FUNCTION__, _key); +#endif return _key; } -- 2.39.5