From 58ab98e53beb55efc7997fefde777334fdb947e7 Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 25 Nov 2004 13:27:05 +0000 Subject: [PATCH] changed default of WOHttpAllowHost to include .localdomain git-svn-id: http://svn.opengroupware.org/SOPE/trunk@414 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 15 ++++++++++----- sope-appserver/NGObjWeb/Defaults.plist | 5 ++++- .../NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m | 7 +++++-- .../NGObjWeb/WOHttpAdaptor/WORequestParser.h | 1 - .../NGObjWeb/WOHttpAdaptor/WORequestParser.m | 1 - sope-appserver/NGObjWeb/WOMailDelivery.m | 5 ++--- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index a121e67e..496ebd6b 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2004-11-25 Helge Hess + + * Defaults.plist: set WOHttpAllowHost per default to ( localhost, + localhost.localdomain ) (v4.5.101) + 2004-11-24 Helge Hess * 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 - - * branched 4.3 into 4.4 and 4.5 - 2004-11-03 Marcus Mueller * 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 + * branched 4.3 into 4.4 and 4.5 + 2004-11-03 Helge Hess * WOWatchDogApplicationMain.m: disable warning on /etc server defaults diff --git a/sope-appserver/NGObjWeb/Defaults.plist b/sope-appserver/NGObjWeb/Defaults.plist index e1ca29a2..54b8ff68 100644 --- 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 dd5effc9..68648af8 100644 --- 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 #include @@ -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 eacb7096..8891c0c8 100644 --- 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 e4958351..e56a6692 100644 --- 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 diff --git a/sope-appserver/NGObjWeb/WOMailDelivery.m b/sope-appserver/NGObjWeb/WOMailDelivery.m index d75a76fd..4c00f99a 100644 --- 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 #include -- 2.39.5