From 312607da1e82e7d1ac0c3093e5f9f2c094055cf7 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 6 Nov 2009 17:19:10 +0000
Subject: [PATCH] https://issues.shibboleth.net/jira/browse/CPPXT-47

---
 xmltooling/soap/OpenSSLSOAPTransport.h     |  2 +-
 xmltooling/soap/impl/CURLSOAPTransport.cpp | 21 ---------------------
 xmltooling/soap/impl/SOAPClient.cpp        | 22 ++++++++++++++++++++++
 xmltooling/xmltooling-lite.vcproj          |  4 ----
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/xmltooling/soap/OpenSSLSOAPTransport.h b/xmltooling/soap/OpenSSLSOAPTransport.h
index eb38ef0..21a2045 100644
--- a/xmltooling/soap/OpenSSLSOAPTransport.h
+++ b/xmltooling/soap/OpenSSLSOAPTransport.h
@@ -20,7 +20,7 @@
  * Encapsulates OpenSSL-capable SOAP transport layer.
  */
 
-#ifndef __xmltooling_opensslsoaptrans_h__
+#if !defined(__xmltooling_opensslsoaptrans_h__) && !defined(XMLTOOLING_NO_XMLSEC)
 #define __xmltooling_opensslsoaptrans_h__
 
 #include <xmltooling/soap/SOAPTransport.h>
diff --git a/xmltooling/soap/impl/CURLSOAPTransport.cpp b/xmltooling/soap/impl/CURLSOAPTransport.cpp
index 460a62e..af06fbb 100644
--- a/xmltooling/soap/impl/CURLSOAPTransport.cpp
+++ b/xmltooling/soap/impl/CURLSOAPTransport.cpp
@@ -271,27 +271,6 @@ void xmltooling::termSOAPTransports()
     g_CURLPool = NULL;
 }
 
-SOAPTransport::SOAPTransport()
-{
-}
-
-SOAPTransport::~SOAPTransport()
-{
-}
-
-bool SOAPTransport::setProviderOption(const char* provider, const char* option, const char* value)
-{
-    return false;
-}
-
-HTTPSOAPTransport::HTTPSOAPTransport()
-{
-}
-
-HTTPSOAPTransport::~HTTPSOAPTransport()
-{
-}
-
 OpenSSLSOAPTransport::OpenSSLSOAPTransport()
 {
 }
diff --git a/xmltooling/soap/impl/SOAPClient.cpp b/xmltooling/soap/impl/SOAPClient.cpp
index 8eaeaed..1978e28 100644
--- a/xmltooling/soap/impl/SOAPClient.cpp
+++ b/xmltooling/soap/impl/SOAPClient.cpp
@@ -23,6 +23,7 @@
 #include "internal.h"
 #include "exceptions.h"
 #include "logging.h"
+#include "soap/HTTPSOAPTransport.h"
 #include "soap/SOAP.h"
 #include "soap/SOAPClient.h"
 #include "util/XMLHelper.h"
@@ -36,6 +37,27 @@ using namespace xmltooling;
 using namespace xercesc;
 using namespace std;
 
+SOAPTransport::SOAPTransport()
+{
+}
+
+SOAPTransport::~SOAPTransport()
+{
+}
+
+bool SOAPTransport::setProviderOption(const char* provider, const char* option, const char* value)
+{
+    return false;
+}
+
+HTTPSOAPTransport::HTTPSOAPTransport()
+{
+}
+
+HTTPSOAPTransport::~HTTPSOAPTransport()
+{
+}
+
 SOAPClient::SOAPClient(bool validate) : m_validate(validate), m_transport(NULL)
 {
 }
diff --git a/xmltooling/xmltooling-lite.vcproj b/xmltooling/xmltooling-lite.vcproj
index ca08327..8968c23 100644
--- a/xmltooling/xmltooling-lite.vcproj
+++ b/xmltooling/xmltooling-lite.vcproj
@@ -692,10 +692,6 @@
 					>
 				</File>
 				<File
-					RelativePath=".\soap\OpenSSLSOAPTransport.h"
-					>
-				</File>
-				<File
 					RelativePath=".\soap\SOAP.h"
 					>
 				</File>
-- 
2.1.4