diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2017-07-19 12:51:28 -0300 |
|---|---|---|
| committer | Aokromes <aokromes@gmail.com> | 2017-07-20 11:26:26 +0200 |
| commit | f7e7aef8fcd057d3f23a83da8bec48abaf36779e (patch) | |
| tree | ab216ac10d5383bd7a6687982d1e89ca87cb1e19 /dep/gsoap/soapServer.cpp | |
| parent | a9174d5eb75b4e0f28542c44b797fcacddc7ab64 (diff) | |
Dep/gSOAP: Update gSOAP to 2.8.49
Closes #20039
Diffstat (limited to 'dep/gsoap/soapServer.cpp')
| -rw-r--r-- | dep/gsoap/soapServer.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/dep/gsoap/soapServer.cpp b/dep/gsoap/soapServer.cpp index f8fa4797180..7514ea28fe9 100644 --- a/dep/gsoap/soapServer.cpp +++ b/dep/gsoap/soapServer.cpp @@ -1,8 +1,8 @@ /* soapServer.cpp - Generated by gSOAP 2.8.33 for gsoap.stub + Generated by gSOAP 2.8.49 for gsoap.stub gSOAP XML Web services tools -Copyright (C) 2000-2016, Robert van Engelen, Genivia Inc. All Rights Reserved. +Copyright (C) 2000-2017, Robert van Engelen, Genivia Inc. All Rights Reserved. The soapcpp2 tool and its generated software are released under the GPL. This program is released under the GPL with the additional exemption that compiling, linking, and/or using OpenSSL is allowed. @@ -17,24 +17,24 @@ A commercial use license is available from Genivia Inc., contact@genivia.com #endif #include "soapH.h" -SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.33 2016-07-29 05:51:35 GMT") +SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.49 2017-07-19 15:45:31 GMT") extern "C" SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap) { #ifndef WITH_FASTCGI - unsigned int k = soap->max_keep_alive; + soap->keep_alive = soap->max_keep_alive + 1; #endif do { #ifndef WITH_FASTCGI - if (soap->max_keep_alive > 0 && !--k) - soap->keep_alive = 0; + if (soap->keep_alive > 0 && soap->max_keep_alive > 0) + soap->keep_alive--; #endif if (soap_begin_serve(soap)) { if (soap->error >= SOAP_STOP) continue; return soap->error; } - if (soap_serve_request(soap) || (soap->fserveloop && soap->fserveloop(soap))) + if ((soap_serve_request(soap) || (soap->fserveloop && soap->fserveloop(soap))) && soap->error && soap->error < SOAP_STOP) { #ifdef WITH_FASTCGI soap_send_fault(soap); @@ -42,7 +42,6 @@ extern "C" SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap) return soap_send_fault(soap); #endif } - #ifdef WITH_FASTCGI soap_destroy(soap); soap_end(soap); |