aboutsummaryrefslogtreecommitdiff
path: root/dep/gsoap/soapServer.cpp
diff options
context:
space:
mode:
authorclick <click@gonnamakeyou.com>2011-04-27 00:34:22 +0200
committerclick <click@gonnamakeyou.com>2011-04-27 00:34:22 +0200
commitd42c048818160e1c5334f59659eb0afbaa1c804f (patch)
treecb3217df40cf951e3abe5bc2e0da304fd640361d /dep/gsoap/soapServer.cpp
parent374eba2f5de1d77a24a15c82cdd64fd80d8132e4 (diff)
Core/Dependencies: update to gSoap v2.8.2 - windows users please test and give feedback if connectionissues has been resolved
Diffstat (limited to 'dep/gsoap/soapServer.cpp')
-rw-r--r--dep/gsoap/soapServer.cpp44
1 files changed, 9 insertions, 35 deletions
diff --git a/dep/gsoap/soapServer.cpp b/dep/gsoap/soapServer.cpp
index ea7058ecf16..8c8206fb3ef 100644
--- a/dep/gsoap/soapServer.cpp
+++ b/dep/gsoap/soapServer.cpp
@@ -1,6 +1,6 @@
/* soapServer.cpp
- Generated by gSOAP 2.8.0 from stub.h
- Copyright(C) 2000-2010, Robert van Engelen, Genivia Inc. All Rights Reserved.
+ Generated by gSOAP 2.8.2 from stub.h
+ Copyright(C) 2000-2011, Robert van Engelen, Genivia Inc. All Rights Reserved.
The generated code is released under one of the following licenses:
GPL OR Genivia's license for commercial use.
*/
@@ -11,7 +11,7 @@
#endif
#include "soapH.h"
-SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.0 2010-12-16 23:55:15 GMT")
+SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.2 2011-04-26 21:49:07 GMT")
SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap)
@@ -19,43 +19,18 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap)
#ifndef WITH_FASTCGI
unsigned int k = soap->max_keep_alive;
#endif
-
do
{
-#ifdef WITH_FASTCGI
- if (FCGI_Accept() < 0)
- {
- soap->error = SOAP_EOF;
- return soap_send_fault(soap);
- }
-#endif
-
- soap_begin(soap);
-
#ifndef WITH_FASTCGI
if (soap->max_keep_alive > 0 && !--k)
soap->keep_alive = 0;
#endif
-
- if (soap_begin_recv(soap))
- { if (soap->error < SOAP_STOP)
- {
-#ifdef WITH_FASTCGI
- soap_send_fault(soap);
-#else
- return soap_send_fault(soap);
-#endif
- }
- soap_closesock(soap);
-
- continue;
+ if (soap_begin_serve(soap))
+ { if (soap->error >= SOAP_STOP)
+ continue;
+ return soap->error;
}
-
- if (soap_envelope_begin_in(soap)
- || soap_recv_header(soap)
- || soap_body_begin_in(soap)
- || soap_serve_request(soap)
- || (soap->fserveloop && soap->fserveloop(soap)))
+ if (soap_serve_request(soap) || (soap->fserveloop && soap->fserveloop(soap)))
{
#ifdef WITH_FASTCGI
soap_send_fault(soap);
@@ -92,14 +67,13 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__executeCommand(struct soap *soap)
soap_tmp_string = NULL;
soap_tmp_ns1__executeCommandResponse.result = &soap_tmp_string;
soap_default_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand);
- soap->encodingStyle = NULL;
if (!soap_get_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand, "ns1:executeCommand", NULL))
return soap->error;
if (soap_body_end_in(soap)
|| soap_envelope_end_in(soap)
|| soap_end_recv(soap))
return soap->error;
- soap->error = ns1__executeCommand(soap, soap_tmp_ns1__executeCommand.command, &soap_tmp_string);
+ soap->error = ns1__executeCommand(soap, soap_tmp_ns1__executeCommand.command, soap_tmp_ns1__executeCommandResponse.result);
if (soap->error)
return soap->error;
soap_serializeheader(soap);