svn commit: r1626103 - in /manifoldcf/branches/dev_1x: ./ CHANGES.txt connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java

[kwright]

Author: kwright
Date: Thu Sep 18 23:36:19 2014
New Revision: 1626103

URL: http://svn.apache.org/r1626103
Log:
Pull up tentative fix for CONNECTORS-1041 from trunk.

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    
manifoldcf/branches/dev_1x/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1626102

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1626103&r1=1626102&r2=1626103&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Thu Sep 18 23:36:19 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.8-dev =====================
 
+CONNECTORS-1041: Livelink connector should force HTTPS off when
+HTTP is selected.
+(Karl Wright)
+
 CONNECTORS-1040: Transformation connectors should use specification
 rather than unpacking version string.
 (Karl Wright)

Modified: 
manifoldcf/branches/dev_1x/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java?rev=1626103&r1=1626102&r2=1626103&view=diff
==============================================================================
--- 
manifoldcf/branches/dev_1x/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java
 (original)
+++ 
manifoldcf/branches/dev_1x/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java
 Thu Sep 18 23:36:19 2014
@@ -171,6 +171,10 @@ public class LLSERVER
           LLSession.GetCARootCerts(certFolder.toString(),rootCACertList);
           configuration.add("CARootCerts", rootCACertList);
         }
+        else
+        {
+          configuration.add("HTTPS", LLValue.LL_FALSE);
+        }
       }
       else
         configuration = null;