* GSWAdaptors/Apache/GNUmakefile.in

* GSWAdaptors/Apache/mod_gsweb.c
          do not reference the common directory anymore
        * move files needed by the Apache adaptor from
          common into the Apache directory


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@36713 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -8,6 +8,11 @@
 	* GSWAdaptors/common/config.h
 	  remove #ifdefs of Netscape, Apache and Apache2, only
 	  leave parts of Apache
+	* GSWAdaptors/Apache/GNUmakefile.in
+	* GSWAdaptors/Apache/mod_gsweb.c
+	  do not reference the common directory anymore
+	* move files needed by the Apache adaptor from
+	  common into the Apache directory
 
 2013-06-06: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
 	* GSWAdaptors/common/GSWAppConnectSocket.c

GSWAdaptors/Apache/GNUmakefile.in

@@ -22,7 +22,6 @@
 #   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 APXS:=@APXS@
-SERVERAPI:=@SERVERAPI@
 APRCONFIG:=@APRCONFIG@
 
 C_CPPFLAGS=@CONFIG_CPPFLAGS@
@@ -47,18 +46,6 @@ AP_INCDIR := $(shell ($(APXS) -q INCLUDEDIR))
 AP_LIBDIR := $(shell ($(APXS) -q LIBEXECDIR))
 AP_SYSDIR := $(shell ($(APXS) -q SYSCONFDIR))
 
-ifeq ($(SERVERAPI),Apache2)
-APR_CFLAGS   := $(shell ($(APRCONFIG) --cflags))
-APR_CPPFLAGS := $(shell ($(APRCONFIG) --cppflags))
-APR_INCDIR   := $(shell ($(APRCONFIG) --includedir))
-APR_LDFLAGS  := $(shell ($(APRCONFIG) --ldflags))
-APR_LIBS     := $(shell ($(APRCONFIG) --libs))
-
-ifneq ($(APR_INCDIR),)
-APR_CPPFLAGS += -I$(APR_INCDIR)
-endif
-endif
-
 # It is not clear, why some versions of of apxs  do not 
 # specify -shared in AP_LDFLAGS_SH as it seems to be the 
 # key flag to create DSO (Dynamic Shared Objects) which
@@ -77,19 +64,12 @@ ifeq ($(MOD_CONF_DIR),)
 MOD_CONF_DIR=$(AP_SYSDIR)
 endif
 
-ifeq ($(SERVERAPI),Apache2)
-ADAPTOR  := mod_gsweb.la
-else
 ADAPTOR  := mod_gsweb.so
-endif
 MOD_CONF := mod_gsweb.conf
 
-COMMON = $(SRCROOT)/common
-
 GSW_CPPFLAGS = \
-	-D$(SERVERAPI) -DREENTRANT -DEAPI \
-	-I. -I$(COMMON) \
-	-I$(AP_INCDIR) $(APR_CPPFLAGS) \
+	-DEAPI \
+	-I. -I$(AP_INCDIR) $(APR_CPPFLAGS) \
 	$(C_CPPFLAGS) $(OTHER_CPPFLAGS)
 
 GSW_CFLAGS = \
@@ -110,16 +90,20 @@ CFLAGS  = $(GSW_CPPFLAGS)
 CFLAGS += $(addprefix -Wc$(comma),$(GSW_CFLAGS))
 LDFLAGS = $(addprefix -Wl$(comma),$(GSW_LDFLAGS))
 
-# Declare default rule before including common.make 
-all:: $(ADAPTOR) $(MOD_CONF)
-
-# Include common.make to set COMMONFILES
-include $(COMMON)/common.make
+ADAPTORFILES = GSWHTTPHeaders.c \
+        config.c GSWConfig.c GSWPropList.c \
+        GSWTemplates.c GSWApp.c \
+        GSWURLUtil.c GSWDict.c \
+        GSWHTTPRequest.c GSWHTTPResponse.c \
+        GSWAppConnectSocket.c GSWUtil.c \
+        GSWAppRequest.c \
+        GSWLoadBalancing.c GSWList.c  \
+        GSWString.c GSWStats.c mod_gsweb.c
 
 # Link the final adaptor module with APXS
-$(ADAPTOR): $(COMMONFILES) $(SRCROOT)/Apache/mod_gsweb.c
+$(ADAPTOR): $(ADAPTORFILES)
 	$(APXS) -c -o $@ $(APXS_FLAGS) $(CFLAGS) $(LDFLAGS) \
-		$(COMMONFILES) $(SRCROOT)/Apache/mod_gsweb.c
+		$(ADAPTORFILES)
 
 # Create mod_gsweb.conf file based on MOD_CONF_DIR (apxs)
 $(MOD_CONF):
@@ -132,6 +116,8 @@ $(MOD_CONF):
 	echo "  SetHandler GSWeb" >> $(MOD_CONF) ; \
 	echo "</Location>" >> $(MOD_CONF) ;
 
+all:: $(ADAPTOR) $(MOD_CONF)
+
 # Install module (via apxs) and mod_gsweb.conf file
 install: $(ADAPTOR) $(MOD_CONF)
 	$(APXS) -i -n gsweb $(ADAPTOR)
@@ -151,9 +137,8 @@ httpdconfig: $(ADAPTOR)
 
 clean:
 	rm -f $(ADAPTOR) $(MOD_CONF) core *~
-	rm -rf .libs ../common/.libs
+	rm -rf .libs 
 	rm -f *.o *.la *.lo *.slo
-	rm -f ../common/*.o ../common/*.la ../common/*.lo ../common/*.slo
 
 distclean: clean
 	rm -rf config.log config.status GNUmakefile autom4te.cache

GSWAdaptors/Apache/mod_gsweb.c

@@ -28,8 +28,7 @@
 #include <string.h>
 #include <sys/param.h>
 
-#include "../common/config.h"
-
+#include "config.h"
 
 #include "GSWUtil.h"
 #include "GSWStats.h"

GSWAdaptors/common/GSWAppConnectNSSocket.c

@@ -1,243 +0,0 @@
-/* GSWAppConnectNSSocket.c - GSWeb: Adaptors: App Connection by Netscape Sockets
-   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-   
-   Written by:	Manuel Guesdon <mguesdon@sbuilders.com>
-   Date: 	July 1999
-   
-   This file is part of the GNUstep Web Library.
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <errno.h>
-
-#include "config.h"
-#include "GSWUtil.h"
-#include "GSWDict.h"
-#include "GSWURLUtil.h"
-//#include "GSWAppRequest.h"
-#include "GSWAppRequestStruct.h"
-#include "GSWAppConnect.h"
-
-typedef SYS_NETFD AppConnectNSSocketHandle;
-
-AppConnectHandle
-GSWApp_Open(GSWAppRequest *p_pAppRequest,
-	    void          *p_pLogServerData)
-{
-  AppConnectHandle handle=NULL;
-  if (!p_pAppRequest)
-    {
-    }
-  else
-    {
-      struct hostent *pHost=NULL;
-
-      //Stats
-      if (!p_pAppRequest->pStats->_tryContactingAppInstanceTS)
-        p_pAppRequest->pStats->_tryContactingAppInstanceTS=GSWTime_now();
-
-      p_pAppRequest->pStats->_tryContactingAppInstanceCount++;
-
-      pHost=hl_find(p_pAppRequest->pszHost);
-      if (!pHost)
-	{
-	  GSWLog(GSW_ERROR, p_pLogServerData,
-		 "gethostbyname(%s) returns no host",
-		 p_pAppRequest->pszHost);
-	}
-      else if (pHost->h_addrtype!=AF_INET)
-	{
-	  GSWLog(GSW_ERROR, p_pLogServerData, "Host %s has bad address type",
-		 p_pAppRequest->pszHost);
-	}
-      else
-	{
-	  AppConnectNSSocketHandle nshandle=NULL;
-	  struct sockaddr_in sin;
-	  memset(&sin,0,sizeof(sin));
-	  sin.sin_family = pHost->h_addrtype;
-	  sin.sin_port = htons(p_pAppRequest->iPort);
-	  memcpy(&sin.sin_addr, pHost->h_addr_list[0] , pHost->h_length);
-
-	  GSWLog(GSW_INFO, p_pLogServerData, "Try contacting %s on port %d...",
-		 p_pAppRequest->pszHost,
-		 p_pAppRequest->iPort);
-	  nshandle = net_socket(AF_INET,SOCK_STREAM,IPPROTO_TCP);	
-	  if (nshandle<0)
-	    {
-	      GSWLog(GSW_ERROR, p_pLogServerData,
-		     "Can't Create socket to %s:%d. Error=%d (%s)",
-		     p_pAppRequest->pszHost,
-		     p_pAppRequest->iPort,
-		     errno,
-		     strerror(errno));
-	    }
-	  else
-	    {
-	      if (net_connect(nshandle,(struct sockaddr *)&sin,sizeof(sin))<0)
-		{
-		  GSWLog(GSW_ERROR, p_pLogServerData,
-			 "Can't connect to %s:%d. Error=%d (%s)",
-			 p_pAppRequest->pszHost,
-			 p_pAppRequest->iPort,
-			 errno,
-			 strerror(errno));
-		  net_close(nshandle);
-		};
-	    };
-	  handle=(AppConnectHandle)nshandle;
-	};
-    };
-  return handle;
-};
-
-void
-GSWApp_Close(AppConnectHandle p_handle,
-	     void            *p_pLogServerData)
-{
-  if (p_handle)
-    {
-      AppConnectNSSocketHandle handle=(AppConnectNSSocketHandle)p_handle;
-      if (handle && handle>(AppConnectNSSocketHandle)1)
-	net_close(handle);
-    };
-};
-
-int
-GSWApp_SendLine(AppConnectHandle p_handle,
-		CONST char      *p_pszBuffer,
-		void            *p_pLogServerData)
-{
-  int iRetValue=-1;
-  if (p_handle)
-    iRetValue=sendbytes(p_handle,p_pszBuffer,strlen(p_pszBuffer));
-  return iRetValue;
-}
-
-int
-GSWApp_SendBlock(AppConnectHandle p_handle,
-		 CONST char      *p_pszBuffer,
-		 int              p_iSize,
-		 void            *p_pLogServerData)
-{
-  int iRetValue=-1;
-  if (p_handle)
-    {
-      AppConnectNSSocketHandle handle=(AppConnectNSSocketHandle)p_handle;
-      int iSent=0;
-      int iRemainingSize = p_iSize;	
-      while (iRemainingSize>0 && iSent>=0)
-	{
-	  iSent=net_write(handle,(char *)p_pszBuffer,iRemainingSize);
-	  if (iSent<0)
-	    GSWLog(GSW_ERROR, p_pLogServerData, 
-		   "send failed. Error=%d (%s)",
-		   errno,
-		   strerror(errno));
-	  else
-	    {
-	      p_pszBuffer+=iSent;
-	      iRemainingSize-=iSent;
-	    };
-	};
-      iRetValue=(iRemainingSize>0) ? -1 : 0;
-    };
-  return iRetValue;
-}
-
-int
-GSWApp_ReceiveLine(AppConnectHandle p_handle,
-		   char            *p_pszBuffer,
-		   int              p_iBufferSize,
-		   void            *p_pLogServerData)
-{
-  int iRetValue=-1;
-  if (p_handle)
-    {
-      AppConnectNSSocketHandle handle=(AppConnectNSSocketHandle)p_handle;
-      char c=0;
-      int iReaden=0;
-      int i = 0;
-      BOOL fOk=TRUE;
-      while (c!='\n' && i<p_iBufferSize-1 && fOk)
-	{
-	  iReaden=net_read(handle,&c,1,APP_CONNECT_TIMEOUT);
-	  if (iReaden<1)
-	    {
-	      GSWLog(GSW_ERROR, p_pLogServerData,
-		     "GSWApp_ReceiveLine. Error=%d (%s)",
-		     errno,
-		     strerror(errno));
-	      iRetValue=0; //??
-	      fOk=FALSE;
-	    }
-	  else
-	    p_pszBuffer[i++] = c;
-	};
-      if (i>0)
-	{
-	  p_pszBuffer[i] = '\0';
-	  iRetValue=DeleteTrailingCRNL(p_pszBuffer);
-	}
-      else
-	iRetValue=0; //??
-    };
-  return iRetValue;
-};
-
-int
-GSWApp_ReceiveBlock(AppConnectHandle p_handle,
-		    char            *p_pszBuffer,
-		    int              p_iBufferSize,
-		    void            *p_pLogServerData) 
-{
-  int iRetValue=-1;
-  if (p_handle)
-    {
-      AppConnectNSSocketHandle handle=(AppConnectNSSocketHandle)p_handle;
-      int iReceived=0;
-      int iRemainingSize=p_iBufferSize;
-      BOOL fOk=TRUE;
-      while (iRemainingSize>0 && fOk)
-	{
-	  iReceived=net_read(handle,p_pszBuffer,
-			     iRemainingSize,APP_CONNECT_TIMEOUT);
-	  if (iReceived<0)
-	    {
-	      GSWLog(GSW_ERROR, p_pLogServerData,
-		     "GSWApp_ReceiveBlock failed. Error=%d %s",
-		     errno,
-		     strerror(errno));
-	      fOk=FALSE;
-	    }
-	  else
-	    {
-	      p_pszBuffer+=iReceived;
-	      iRemainingSize-=iReceived;
-	    };
-	};
-      iRetValue=p_iBufferSize-iRemainingSize;
-    };
-  return iRetValue;
-};