changed default of WOHttpAllowHost to include .localdomain

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@414 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index a121e67e36960892a4fd692380368a705241d761..496ebd6bd35f8b1ed69b2b02d34558a816476795 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-25  Helge Hess  <helge.hess@skyrix.com>
+
+       * Defaults.plist: set WOHttpAllowHost per default to ( localhost,
+         localhost.localdomain ) (v4.5.101)
+
 2004-11-24  Helge Hess  <helge.hess@opengroupware.org>
 
        * DynamicElements/WOForm.m: minor code cleanups (v4.5.100)
@@ -160,16 +165,16 @@
 
        * use Version file for install directory location
 
-2004-11-04  Helge Hess  <helge.hess@skyrix.com>
-
-       * branched 4.3 into 4.4 and 4.5
-       
 2004-11-03  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * DynamicElements/*.api: provided formal specifications for all
          dynamic elements in a format borrowed from WebObjects 4.51.
-         (v4.3.83)
+         (v4.5.83)
+
+2004-11-03  Helge Hess  <helge.hess@skyrix.com>
 
+       * branched 4.3 into 4.4 and 4.5
+       
 2004-11-03  Helge Hess  <helge.hess@skyrix.com>
 
        * WOWatchDogApplicationMain.m: disable warning on /etc server defaults

diff --git a/sope-appserver/NGObjWeb/Defaults.plist b/sope-appserver/NGObjWeb/Defaults.plist
index e1ca29a243ce965cfc1e7f6e737f6c8f3ca114b4..54b8ff68ae0c7f115062b4f6e012e11a5576bd92 100644 (file)
--- a/sope-appserver/NGObjWeb/Defaults.plist
+++ b/sope-appserver/NGObjWeb/Defaults.plist
@@ -57,7 +57,10 @@
   WOHttpAdaptorReceiveTimeout           = 120;
   WOHttpAdaptorSendTimeout              = 120;
   WOHttpAdaptor_LogStream               = NO;
-  WOHttpAllowHost                       = "localhost";
+  WOHttpAllowHost                       = ( 
+    "localhost", 
+    "localhost.localdomain"
+  );
   WOHttpTransactionUseSimpleParser      = NO;
   WOHttpTransactionLoggerConfig         = {
     "LogLevel"  = "INFO";

diff --git a/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m b/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m
index dd5effc9f47d6a7b75f9e70a64f1c7e565441f8b..68648af8dcaa578722e9236f367cefc6500e610c 100644 (file)
--- a/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m
+++ b/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <NGObjWeb/WOAdaptor.h>
 #include <NGObjWeb/WOCoreApplication.h>
@@ -444,7 +443,11 @@ static BOOL     debugOn                      = NO;
   if (ipDomain == nil)
     ipDomain = [[NGInternetSocketDomain domain] retain];
   
-  if ([[remote domain] isEqual:ipDomain]) {
+  /* always allow access for Unix domain sockets */
+  if (![[remote domain] isEqual:ipDomain])
+    return _connection;
+  
+  {
     /* check access */
     NGInternetSocketAddress *ipAddr = (id)remote;
     NSArray *allow = nil;

diff --git a/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequestParser.h b/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequestParser.h
index eacb7096802b8ad8c272839e45511f1e31315020..8891c0c8a8ae030ac41490c0ecd5d2e085184eae 100644 (file)
--- a/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequestParser.h
+++ b/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequestParser.h
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __WOHttpAdaptor_WORequestParser_H__
 #define __WOHttpAdaptor_WORequestParser_H__

diff --git a/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequestParser.m b/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequestParser.m
index e4958351b0364ee06b86f4e2856efda2f95a5f55..e56a6692f810d3adb0bab7e9c022c6ac848e5e6f 100644 (file)
--- a/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequestParser.m
+++ b/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequestParser.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: WORequestParser.m 1 2004-08-20 10:08:27Z znek $
 
 #include "WORequestParser.h"
 #include <NGStreams/NGBufferedStream.h>

diff --git a/sope-appserver/NGObjWeb/WOMailDelivery.m b/sope-appserver/NGObjWeb/WOMailDelivery.m
index d75a76fdfd26bbb573a5ebd653cbd61a0a634246..4c00f99adc7ba4feeb3dcf5aed5a0204184a2c11 100644 (file)
--- a/sope-appserver/NGObjWeb/WOMailDelivery.m
+++ b/sope-appserver/NGObjWeb/WOMailDelivery.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo 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
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <NGObjWeb/WOMailDelivery.h>
 #include <NGObjWeb/WOComponent.h>