From 18821d8dce2aff6011c6ee11bb2ca3c52603df7b Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sat, 12 Mar 2005 20:43:50 +0000
Subject: [PATCH] improved HTTP version headers properly specify charset in
 MIME headers

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@648 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-appserver/NGObjWeb/ChangeLog             | 11 +++++++
 sope-appserver/NGObjWeb/Version               |  2 +-
 sope-appserver/NGObjWeb/WOHTTPConnection.m    | 10 ++++++-
 sope-appserver/NGObjWeb/WOStats.m             |  6 ++--
 sope-appserver/NGObjWeb/WebDAV/GNUmakefile    |  2 ++
 .../NGObjWeb/WebDAV/GNUmakefile.preamble      |  6 ++++
 .../NGObjWeb/WebDAV/SoWebDAVRenderer.m        | 30 ++++++++++++++-----
 7 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 34404b06..49eb9139 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,14 @@
+2005-03-12  Helge Hess  <helge.hess@opengroupware.org>
+
+	* v4.5.135
+	
+	* WOHTTPConnection.m: deliver proper SOPE version in 'user-agent'
+	
+	* SoWebDAVRenderer.m: deliver proper SOPE version in 'server' header
+	
+	* WOStats.m, SoWebDAVRenderer.m: explicitly specify charset of text/xml
+	  result
+
 2005-03-11  Helge Hess  <helge.hess@opengroupware.org>
 
 	* WebDAV/SoWebDAVRenderer.m: fixed ordering of propstat result elements
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index ab606870..442dc460 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=134
+SUBMINOR_VERSION:=135
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134
diff --git a/sope-appserver/NGObjWeb/WOHTTPConnection.m b/sope-appserver/NGObjWeb/WOHTTPConnection.m
index 2ab95a68..8cdc3da0 100644
--- a/sope-appserver/NGObjWeb/WOHTTPConnection.m
+++ b/sope-appserver/NGObjWeb/WOHTTPConnection.m
@@ -460,7 +460,15 @@ static BOOL logStream = NO;
     [self debugWithFormat:@"  wrote accept header ..."];
   }
   if ([_request headerForKey:@"user-agent"] == nil) {
-    if (isok) isok = [self->io writeString:@"User-Agent: SOPE/4.2\r\n"];
+    if (isok) {
+      static NSString *s = nil;
+      if (s == nil) {
+	s = [[NSString alloc] initWithFormat:@"User-Agent: SOPE/%i.%i.%i\r\n",
+			      SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION, 
+			      SOPE_SUBMINOR_VERSION];
+      }
+      isok = [self->io writeString:s];
+    }
     [self debugWithFormat:@"  wrote user-agent header ..."];
   }
   
diff --git a/sope-appserver/NGObjWeb/WOStats.m b/sope-appserver/NGObjWeb/WOStats.m
index e13b3105..5c95c358 100644
--- a/sope-appserver/NGObjWeb/WOStats.m
+++ b/sope-appserver/NGObjWeb/WOStats.m
@@ -149,18 +149,18 @@
     xslPath = nil;
   
   response = [WOResponse responseWithRequest:[self request]];
-  [response setHeader:@"text/xml" forKey:@"content-type"];
+  [response setContentEncoding:NSUTF8StringEncoding];
+  [response setHeader:@"text/xml; charset=utf-8" forKey:@"content-type"];
   
   stats = [[app statisticsStore] statistics];
   
   [response appendContentString:@"<?xml version='1.0'?>\n"];
-#if 1
   if ([xslPath length] > 0) {
     [response appendContentString:@"<?xml-stylesheet type='text/xsl' href='"];
     [response appendContentString:xslPath];
     [response appendContentString:@"'?>"];
   }
-#endif
+
   [response appendContentString:@"<application name='"];
   [response appendContentString:[app name]];
   [response appendContentString:@"'"];
diff --git a/sope-appserver/NGObjWeb/WebDAV/GNUmakefile b/sope-appserver/NGObjWeb/WebDAV/GNUmakefile
index 914b4bef..e1435678 100644
--- a/sope-appserver/NGObjWeb/WebDAV/GNUmakefile
+++ b/sope-appserver/NGObjWeb/WebDAV/GNUmakefile
@@ -1,6 +1,8 @@
 # GNUstep makefile
 
 -include ../../../config.make
+include ../../Version
+include ../Version
 include $(GNUSTEP_MAKEFILES)/common.make
 
 SUBPROJECT_NAME = WebDAV
diff --git a/sope-appserver/NGObjWeb/WebDAV/GNUmakefile.preamble b/sope-appserver/NGObjWeb/WebDAV/GNUmakefile.preamble
index 4af3dc4e..d526499b 100644
--- a/sope-appserver/NGObjWeb/WebDAV/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/WebDAV/GNUmakefile.preamble
@@ -1,5 +1,11 @@
 # compiler flags
 
+ADDITIONAL_CPPFLAGS += \
+        -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
+        -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION)   \
+        -DSOPE_MINOR_VERSION=$(MINOR_VERSION)   \
+        -DSOPE_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
+
 ADDITIONAL_INCLUDE_DIRS += \
 	-I..			\
 	-I../SoObjects/		\
diff --git a/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m b/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
index 720f3c5c..6e4ee60d 100644
--- a/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
@@ -96,7 +96,15 @@ static BOOL         formatOutput = NO;
   
   if ((tmp = [_r headerForKey:@"server"]) == nil) {
     // TODO: add application name as primary name
-    [_r setHeader:@"SOPE 4.2/WebDAV" forKey:@"server"];
+    static NSString *server = nil;
+
+    if (server == nil) {
+      server = [[NSString alloc] initWithFormat:@"SOPE %i.%i.%i/WebDAV",
+				 SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION,
+				 SOPE_SUBMINOR_VERSION];
+    }
+    
+    [_r setHeader:server forKey:@"server"];
   }
   
   [_r setHeader:@"close" forKey:@"connection"];
@@ -762,6 +770,8 @@ static BOOL         formatOutput = NO;
   /* generate multistatus */
    
   [r setStatus:207 /* multistatus */];
+  [r setContentEncoding:NSUTF8StringEncoding];
+  [r setHeader:@"text/xml; charset=\"utf-8\"" forKey:@"content-type"];
   [r setHeader:@"no-cache" forKey:@"pragma"];
   [r setHeader:@"no-cache" forKey:@"cache-control"];
   
@@ -842,7 +852,7 @@ static BOOL         formatOutput = NO;
   
   r = [_ctx response];
   
-  [r setStatus:200];
+  [r setStatus:200 /* OK */];
   [r setContentEncoding:NSUTF8StringEncoding];
   [r setHeader:@"text/xml; charset=\"utf-8\"" forKey:@"content-type"];
   [r setHeader:[_object stringValue]          forKey:@"lock-token"];
@@ -894,12 +904,12 @@ static BOOL         formatOutput = NO;
   notificationType  = [rq headerForKey:@"notification-type"];
   lifetime          = [rq headerForKey:@"subscription-lifetime"];
   
-  [r setStatus:200];
-  if (notificationType)
+  [r setStatus:200 /* OK */];
+  if (notificationType != nil)
     [r setHeader:notificationType forKey:@"notification-type"];
-  if (lifetime)
+  if (lifetime != nil)
     [r setHeader:lifetime         forKey:@"subscription-lifetime"];
-  if (callback)
+  if (callback != nil)
     [r setHeader:callback         forKey:@"callback"];
   [r setHeader:[self baseURLForContext:_ctx] forKey:@"content-location"];
   [r setHeader:_object forKey:@"subscription-id"];
@@ -921,6 +931,8 @@ static BOOL         formatOutput = NO;
 	nsToPrefix:nsToPrefix];
   
   [r setStatus:207 /* multistatus */];
+  [r setContentEncoding:NSUTF8StringEncoding];
+  [r setHeader:@"text/xml; charset=\"utf-8\"" forKey:@"content-type"];
   [r appendContentString:@"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"];
   [r appendContentString:@"<D:multistatus"];
   [r appendContentString:[self nsDeclsForMap:nsToPrefix]];
@@ -1101,7 +1113,8 @@ static BOOL         formatOutput = NO;
     inactive = [_object objectForKey:@"inactive"];
     
     [r setStatus:207 /* Multi-Status */];
-    [r setHeader:@"text/xml" forKey:@"content-type"];
+    [r setContentEncoding:NSUTF8StringEncoding];
+    [r setHeader:@"text/xml; charset=\"utf-8\"" forKey:@"content-type"];
 
     [r appendContentString:@"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"];
     [r appendContentString:@"<D:multistatus "];
@@ -1119,7 +1132,8 @@ static BOOL         formatOutput = NO;
   }
   else if ([_object isKindOfClass:[NSArray class]]) {
     [r setStatus:207 /* Multi-Status */];
-    [r setHeader:@"text/xml" forKey:@"content-type"];
+    [r setContentEncoding:NSUTF8StringEncoding];
+    [r setHeader:@"text/xml; charset=\"utf-8\"" forKey:@"content-type"];
 
     [r appendContentString:@"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"];
     [r appendContentString:@"<D:multistatus "];
-- 
2.39.5