manifoldcf-commits mailing list archives

Author: kwright
Date: Thu Sep 18 23:39:23 2014
New Revision: 1626104

URL: http://svn.apache.org/r1626104
Log:
Pull up fix for CONNECTORS-1041 from dev_1x branch

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

Propchange: manifoldcf/branches/release-1.7-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/dev_1x:r1626103
  Merged /manifoldcf/trunk:r1626102

Modified: manifoldcf/branches/release-1.7-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/CHANGES.txt?rev=1626104&r1=1626103&r2=1626104&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.7-branch/CHANGES.txt Thu Sep 18 23:39:23 2014
@@ -4,6 +4,10 @@ $Id$
 
 ======================= Release 1.7.1 =====================
 
+CONNECTORS-1041: Livelink connector should force HTTPS off when
+HTTP is selected.
+(Karl Wright)
+
 CONNECTORS-1036: Zookeeper service handling also has
 ephemeral nodes which need to be tied to sessions.
 (Karl Wright)

Modified: manifoldcf/branches/release-1.7-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java?rev=1626104&r1=1626103&r2=1626104&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java
(original)
+++ manifoldcf/branches/release-1.7-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java
Thu Sep 18 23:39:23 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;