diff options
| -rw-r--r-- | examples/csoap/Makefile.am | 9 | ||||
| -rwxr-xr-x | examples/csoap/echoattachments-client.c | 4 | ||||
| -rwxr-xr-x | examples/csoap/echoattachments-server.c | 4 | ||||
| -rw-r--r-- | libcsoap/Makefile.am | 6 | ||||
| -rw-r--r-- | nanohttp/Makefile.am | 12 | ||||
| -rw-r--r-- | nanohttp/nanohttp-client.c | 3 | ||||
| -rw-r--r-- | nanohttp/nanohttp-client.h | 3 | ||||
| -rw-r--r-- | nanohttp/nanohttp-socket.c | 12 | ||||
| -rwxr-xr-x | wsdl2c/Makefile.am | 5 | ||||
| -rwxr-xr-x | xsd2c/Makefile.am | 2 |
10 files changed, 43 insertions, 17 deletions
diff --git a/examples/csoap/Makefile.am b/examples/csoap/Makefile.am index bb62213..3d47dc3 100644 --- a/examples/csoap/Makefile.am +++ b/examples/csoap/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS=simpleclient simpleserver +bin_PROGRAMS=simpleclient simpleserver echoattachments-client echoattachments-server INCLUDES=-I$(top_srcdir)/ $(LIBXML_CFLAGS) LDFLAGS=-L$(top_builddir)/nanohttp -lnanohttp-$(GENERIC_API_VERSION) \ @@ -12,6 +12,13 @@ simpleclient_LDFLAGS=$(LDFLAGS) simpleserver_SOURCES=simpleserver.c simpleserver_LDFLAGS=$(LDFLAGS) +echoattachments_server_SOURCES=echoattachments-server.c +echoattachments_server_LDFLAGS=$(LDFLAGS) + +echoattachments_client_SOURCES=echoattachments-client.c +echoattachments_client_LDFLAGS=$(LDFLAGS) + + diff --git a/examples/csoap/echoattachments-client.c b/examples/csoap/echoattachments-client.c index 63b7a21..352a73c 100755 --- a/examples/csoap/echoattachments-client.c +++ b/examples/csoap/echoattachments-client.c @@ -1,5 +1,5 @@ /****************************************************************** - * $Id: echoattachments-client.c,v 1.2 2004/10/15 13:53:36 snowdrop Exp $ + * $Id: echoattachments-client.c,v 1.3 2004/10/15 15:10:14 snowdrop Exp $ * * CSOAP Project: CSOAP examples project * Copyright (C) 2003-2004 Ferhat Ayaz @@ -27,7 +27,7 @@ /* static const char *url = "http://csoap.sourceforge.net/cgi-bin/csoapserver"; */ -static const char *url = "http://localhost:10000/echoattachments"; +static const char *url = "http://localhost:10000/echoattachment"; static const char *urn = ""; static const char *method = "echo"; diff --git a/examples/csoap/echoattachments-server.c b/examples/csoap/echoattachments-server.c index 319618d..701d6a6 100755 --- a/examples/csoap/echoattachments-server.c +++ b/examples/csoap/echoattachments-server.c @@ -1,5 +1,5 @@ /******************************************************************
- * $Id: echoattachments-server.c,v 1.1 2004/10/15 13:42:57 snowdrop Exp $
+ * $Id: echoattachments-server.c,v 1.2 2004/10/15 15:10:15 snowdrop Exp $
*
* CSOAP Project: CSOAP examples project
* Copyright (C) 2003-2004 Ferhat Ayaz
@@ -24,7 +24,7 @@ #include <libcsoap/soap-server.h>
-static const char *url = "/axis/services/urn:EchoAttachmentsService";
+static const char *url = "/echoattachment";
static const char *urn = "";
static const char *method = "echo";
diff --git a/libcsoap/Makefile.am b/libcsoap/Makefile.am index 4bb9415..3a19e5b 100644 --- a/libcsoap/Makefile.am +++ b/libcsoap/Makefile.am @@ -7,7 +7,8 @@ soap-env.h\ soap-service.h\ soap-router.h\ soap-client.h\ -soap-server.h +soap-server.h\ +soap-ctx.h cc_sources = soap-xml.c\ soap-fault.c\ @@ -15,7 +16,8 @@ soap-env.c\ soap-service.c\ soap-router.c\ soap-client.c\ -soap-server.c +soap-server.c\ +soap-ctx.c library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME) library_include_HEADERS = $(h_sources) diff --git a/nanohttp/Makefile.am b/nanohttp/Makefile.am index ba3cf78..c59e0f8 100644 --- a/nanohttp/Makefile.am +++ b/nanohttp/Makefile.am @@ -5,14 +5,20 @@ h_sources = nanohttp-common.h\ nanohttp-socket.h\ nanohttp-client.h\ nanohttp-server.h\ -nanohttp-reqres.h\ -nanohttp-stream.h +nanohttp-stream.h\ +nanohttp-mime.h\ +nanohttp-request.h\ +nanohttp-response.h cc_sources = nanohttp-common.c\ nanohttp-socket.c\ nanohttp-client.c\ nanohttp-server.c\ -nanohttp-stream.c +nanohttp-stream.c\ +nanohttp-mime.c\ +nanohttp-request.c\ +nanohttp-response.c + library_includedir=$(includedir)/$(NANOHTTP_LIBRARY_NAME)-$(NANOHTTP_API_VERSION)/$(NANOHTTP_LIBRARY_NAME) library_include_HEADERS = $(h_sources) diff --git a/nanohttp/nanohttp-client.c b/nanohttp/nanohttp-client.c index 3c3ce7f..9c0c7d0 100644 --- a/nanohttp/nanohttp-client.c +++ b/nanohttp/nanohttp-client.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: nanohttp-client.c,v 1.20 2004/10/15 13:29:36 snowdrop Exp $ +* $Id: nanohttp-client.c,v 1.21 2004/10/15 15:10:37 snowdrop Exp $ * * CSOAP Project: A http client/server library in C * Copyright (C) 2003 Ferhat Ayaz @@ -31,6 +31,7 @@ #include <time.h> #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #ifdef MEM_DEBUG #include <utils/alloc.h> diff --git a/nanohttp/nanohttp-client.h b/nanohttp/nanohttp-client.h index 8bd8579..ec4a837 100644 --- a/nanohttp/nanohttp-client.h +++ b/nanohttp/nanohttp-client.h @@ -1,5 +1,5 @@ /******************************************************************
- * $Id: nanohttp-client.h,v 1.9 2004/10/15 13:29:36 snowdrop Exp $
+ * $Id: nanohttp-client.h,v 1.10 2004/10/15 15:10:37 snowdrop Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2003 Ferhat Ayaz
@@ -28,6 +28,7 @@ #include <nanohttp/nanohttp-common.h>
#include <nanohttp/nanohttp-socket.h>
#include <nanohttp/nanohttp-response.h>
+#include <nanohttp/nanohttp-stream.h>
typedef struct httpc_conn
{
diff --git a/nanohttp/nanohttp-socket.c b/nanohttp/nanohttp-socket.c index 82d7280..e437df7 100644 --- a/nanohttp/nanohttp-socket.c +++ b/nanohttp/nanohttp-socket.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: nanohttp-socket.c,v 1.23 2004/10/15 13:29:37 snowdrop Exp $ +* $Id: nanohttp-socket.c,v 1.24 2004/10/15 15:10:37 snowdrop Exp $ * * CSOAP Project: A http client/server library in C * Copyright (C) 2003 Ferhat Ayaz @@ -266,7 +266,15 @@ hsocket_close (hsocket_t sock) closesocket (sock); */ #else - close (sock); + /* + struct linger _linger; + hsocket_block(sock,1); + _linger.l_onoff =1; + _linger.l_linger = 30000; + setsockopt(sock, SOL_SOCKET, SO_LINGER, (const char*)&_linger, sizeof(struct linger)); + + + close (sock);*/ #endif } diff --git a/wsdl2c/Makefile.am b/wsdl2c/Makefile.am index db3a8c0..6a4518f 100755 --- a/wsdl2c/Makefile.am +++ b/wsdl2c/Makefile.am @@ -9,8 +9,9 @@ xsd2c_objs=../xsd2c/util.o \ ../xsd2c/formatter.o \ ../xsd2c/obj.o \ ../xsd2c/xsd2c.o \ -../xsd2c/tr.o +../xsd2c/tr.o \ +../xsd2c/Enumeration.o -wsdl2c_SOURCES=CallVar.c CallFunc.c CallList.c wsdl2c.c +wsdl2c_SOURCES=CallVar.c CallFunc.c CallList.c codewriter.c wsdl2c.c wsdl2c_LDFLAGS=$(LDFLAGS) $(xsd2c_objs) diff --git a/xsd2c/Makefile.am b/xsd2c/Makefile.am index 800892e..5b964cc 100755 --- a/xsd2c/Makefile.am +++ b/xsd2c/Makefile.am @@ -3,6 +3,6 @@ bin_PROGRAMS=xsd2c INCLUDES=$(LIBXML_CFLAGS) LDFLAGS=$(LIBXML_LIBS) -xsd2c_SOURCES=tr.c util.c obj.c formatter.c xsd2c.c main.c +xsd2c_SOURCES=tr.c Enumeration.c util.c obj.c formatter.c xsd2c.c main.c xsd2c_LDFLAGS=$(LDFLAGS) |