Revert SL-13927 commit 8c8eac256bdb51fdf9e6e297280b2017d26c3588.

Got into D503 by accident

2 files changed, 2 insertions, 20 deletions

diff --git a/indra/llcorehttp/httpoptions.cpp b/indra/llcorehttp/httpoptions.cpp
index c6365e5091..df5aa52fa9 100644
--- a/indra/llcorehttp/httpoptions.cpp
+++ b/indra/llcorehttp/httpoptions.cpp
@@ -32,7 +32,6 @@
 namespace LLCore
 {
 
-    bool HttpOptions::sDefaultVerifyPeer = false;
 
 HttpOptions::HttpOptions() :
     mWantHeaders(false),
@@ -44,7 +43,7 @@ HttpOptions::HttpOptions() :
     mMaxRetryBackoff(HTTP_RETRY_BACKOFF_MAX_DEFAULT),
     mUseRetryAfter(HTTP_USE_RETRY_AFTER_DEFAULT),
     mFollowRedirects(true),
-    mVerifyPeer(sDefaultVerifyPeer),
+    mVerifyPeer(false),
     mVerifyHost(false),
     mDNSCacheTimeout(-1L),
     mNoBody(false)
@@ -123,15 +122,7 @@ void HttpOptions::setHeadersOnly(bool nobody)
 {
     mNoBody = nobody;
     if (mNoBody)
-    {
         setWantHeaders(true);
-        setSSLVerifyPeer(false);
-    }
-}
-
-void HttpOptions::setDefaultSSLVerifyPeer(bool verify)
-{
-    sDefaultVerifyPeer = verify;
 }
 
 }   // end namespace LLCore
diff --git a/indra/llcorehttp/httpoptions.h b/indra/llcorehttp/httpoptions.h
index 41f71896b0..8a6de61b04 100644
--- a/indra/llcorehttp/httpoptions.h
+++ b/indra/llcorehttp/httpoptions.h
@@ -143,7 +143,7 @@ public:
 
     /// Instructs the LLCore::HTTPRequest to verify that the exchanged security
     /// certificate is authentic. 
-    /// Default: sDefaultVerifyPeer
+    /// Default: false
     void				setSSLVerifyPeer(bool verify);
 	bool				getSSLVerifyPeer() const
 	{
@@ -177,13 +177,6 @@ public:
     {
         return mNoBody;
     }
-
-    /// Sets default behavior for verifying that the name in the 
-    /// security certificate matches the name of the host contacted.
-    /// Defaults false if not set, but should be set according to
-    /// viewer's initialization options and command argunments, see
-    /// NoVerifySSLCert
-    static void         setDefaultSSLVerifyPeer(bool verify);
 	
 protected:
 	bool				mWantHeaders;
@@ -199,8 +192,6 @@ protected:
 	bool        		mVerifyHost;
 	int					mDNSCacheTimeout;
     bool                mNoBody;
-
-    static bool         sDefaultVerifyPeer;
 }; // end class HttpOptions