bumped Xcode projects to version 4.7. Added a new Xcode project for the STXSaxDriver.

[sope] / sope-appserver / NGObjWeb / NGHttp+WO.m

diff --git a/sope-appserver/NGObjWeb/NGHttp+WO.m b/sope-appserver/NGObjWeb/NGHttp+WO.m
index 0c06a98cf5a6a8df575a3093643521f6f62afb2d..d3bd3b08f3f2a31ef4b057c99ce529e0b841b58b 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp+WO.m
+++ b/sope-appserver/NGObjWeb/NGHttp+WO.m
@@ -1,20 +1,20 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
@@ -25,6 +25,7 @@
 #include <NGObjWeb/WORequest.h>
 #include <NGMime/NGMime.h>
 #include "common.h"
+#include <string.h>
 
 @interface WORequest(NGSupport)
 - (void)_setHttpRequest:(NGHttpRequest *)_request;
@@ -195,7 +196,7 @@ static Class NSArrayClass = Nil;
     return;
   }
 
-  cookieValue = [_cookie value];
+  cookieValue = [(NGHttpCookie *)_cookie value];
   if ([cookieValue isKindOfClass:[NSArray class]]) {
     if ([cookieValue count] == 0)
       cookieValue = @"";
@@ -361,8 +362,8 @@ static Class      DispClass = Nil;
   }
   
   p++; // skip the '?'
-  map = NGDecodeUrlFormParameters(p, strlen(p));
-  if (uribuf) free(uribuf); uribuf = NULL; p = NULL;
+  map = NGDecodeUrlFormParameters((unsigned char *)p, strlen((char *)p));
+  if (uribuf != NULL) free(uribuf); uribuf = NULL; p = NULL;
   
   if (map == nil) 
     return formContent;