aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dep/PackageList.txt4
-rw-r--r--dep/gsoap/soapObject.h57
-rw-r--r--sql/updates/world/2012_08_04_03_world_disables.sql2
3 files changed, 3 insertions, 60 deletions
diff --git a/dep/PackageList.txt b/dep/PackageList.txt
index e5003ec744a..04cdaef9e66 100644
--- a/dep/PackageList.txt
+++ b/dep/PackageList.txt
@@ -14,7 +14,7 @@ G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
jemalloc (a general-purpose scalable concurrent malloc-implementation)
http://www.canonware.com/jemalloc/
- Version: 2.2.5
+ Version: 2.1.0
libMPQ (a library for reading MPQ files)
https://libmpq.org/
@@ -38,4 +38,4 @@ zlib (A Massively Spiffy Yet Delicately Unobtrusive Compression Library)
gSOAP (a portable development toolkit for C and C++ XML Web services and XML data bindings)
http://gsoap2.sourceforge.net/
- Version: 2.8.2
+ Version: 2.8.10
diff --git a/dep/gsoap/soapObject.h b/dep/gsoap/soapObject.h
deleted file mode 100644
index 74be68bb76a..00000000000
--- a/dep/gsoap/soapObject.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* soapObject.h
- Generated by gSOAP 2.8.10 from gsoap.stub
-
-Copyright(C) 2000-2012, Robert van Engelen, Genivia Inc. All Rights Reserved.
-The generated code is released under one of the following licenses:
-1) GPL or 2) Genivia's license for commercial use.
-This program is released under the GPL with the additional exemption that
-compiling, linking, and/or using OpenSSL is allowed.
-*/
-
-#ifndef soapServiceObject_H
-#define soapServiceObject_H
-#include "soapH.h"
-
-/******************************************************************************\
- * *
- * Service Object *
- * *
-\******************************************************************************/
-
-class ServiceService : public soap
-{ public:
- ServiceService()
- { static const struct Namespace namespaces[] =
-{
- {"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/*/soap-envelope", NULL},
- {"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/", "http://www.w3.org/*/soap-encoding", NULL},
- {"xsi", "http://www.w3.org/2001/XMLSchema-instance", "http://www.w3.org/*/XMLSchema-instance", NULL},
- {"xsd", "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/*/XMLSchema", NULL},
- {"ns1", "http://tempuri.org/ns1.xsd", NULL, NULL},
- {NULL, NULL, NULL, NULL}
-};
-
- this->namespaces = namespaces; };
- virtual ~ServiceService() { };
- /// Bind service to port (returns master socket or SOAP_INVALID_SOCKET)
- virtual SOAP_SOCKET bind(const char *host, int port, int backlog) { return soap_bind(this, host, port, backlog); };
- /// Accept next request (returns socket or SOAP_INVALID_SOCKET)
- virtual SOAP_SOCKET accept() { return soap_accept(this); };
-#if defined(WITH_OPENSSL) || defined(WITH_GNUTLS)
- /// Then accept SSL handshake, when SSL is used
- virtual int ssl_accept() { return soap_ssl_accept(this); };
-#endif
- /// Serve this request (returns error code or SOAP_OK)
- virtual int serve() { return soap_serve(this); };
-};
-
-/******************************************************************************\
- * *
- * Service Operations (you should define these globally) *
- * *
-\******************************************************************************/
-
-
-SOAP_FMAC5 int SOAP_FMAC6 ns1__executeCommand(struct soap*, char *command, char **result);
-
-#endif
diff --git a/sql/updates/world/2012_08_04_03_world_disables.sql b/sql/updates/world/2012_08_04_03_world_disables.sql
index 21b55a3e930..e2d1ca1ff6b 100644
--- a/sql/updates/world/2012_08_04_03_world_disables.sql
+++ b/sql/updates/world/2012_08_04_03_world_disables.sql
@@ -1,4 +1,4 @@
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (9754,9755,10215,11522,12445,12731,12923,13541);
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (9754,9755,10215,11522,12445,12731,12923,13541,7797,7869,7870,7906,9378,9611,9880,9881,9908,9909,9949,9950,10088,10181,10214,10454,11197,11226,11577,11874,11937,12485,12600,13123,13210,13317,13990);
INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES
(1,9754,0,'','','Deprecated quest: '),
(1,9755,0,'','','Deprecated quest: '),