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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index df79cdfec6f37f515c204f01c7497e895d9733ee..49528f746b366b000e63885fc98b7292b55f3a98 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,14 @@
+2005-07-23  Sebastian Reitenbach  <reitenbach@rapideye.de>
+
+       * GNUmakefile.preamble: added OpenBSD linking flags (v4.5.179)
+
+2005-07-23  Helge Hess  <helge.hess@opengroupware.org>
+
+       * 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  <helge.hess@opengroupware.org>
        
        * SoObjects/WOContext+SoObjects.m: lookup SoUser using authenticator in

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 4ec44d0741c0c2c7b341492f327be67860aa3064..3f67425d04091d2aacb128ceaa54dae50ed0e943 100644 (file)
--- 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 1fa0159fc1183586f04f9b7f4cac64d7daad1c1a..2e90b8ba1c54bbbe4d4a1c3c02c8986cf7978cf6 100644 (file)
--- 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 f162a058785fb5ca41d53f0b99d31bc64edf3ebe..9cc49c9947acb612b14dd53642f040f5524d33ed 100644 (file)
--- 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 67fbd1737476ea8ced0c1202c1bdb01104645610..6209859b863bb9e8c22e6c94711dd01610e7e337 100644 (file)
--- 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 9bae37d0e801bf9052a0c6c561bb09f683a29270..89f6c91a58d530dd3237288a98a1bec15cdd1994 100644 (file)
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-23  Sebastian Reitenbach  <reitenbach@rapideye.de>
+
+       * GNUmakefile.preamble: added OpenBSD linking flags (v4.5.17)
+
 2005-05-03  Helge Hess  <helge.hess@opengroupware.org>
 
        * GNUmakefile.preamble: added strict bundle dependencies for MacOSX

diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble
index 6184c0a261e8f073856da487d7069a70396e4fbc..857a7764f42b1ad9f62e18f22c1c54914c6ada88 100644 (file)
--- 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 0a8bca08b028c66e6050ed1d0523f0c70aac5617..3c3eedfd9be9674738563e52ca04e222c558e0b0 100644 (file)
--- 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 9809b005ff4f42071abd630e4193be2818c31e30..413519a632cf400e94573ed662aed2fd6a6b59a0 100644 (file)
--- 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;
 }