Merge branch 'master' into unstable

Change-Id: I33ce479e35533cf40df1579f0727d94da61de5b2
couchbase · Feb 15, 2019 · 5abe9ad · 5abe9ad
2 parents de8e55f + f284ae5
commit 5abe9ad
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/gen/CMakeLists.txt b/gen/CMakeLists.txt
@@ -19,7 +19,9 @@ IF(APPLE)
   SET (LDFLAGS "-s -extldflags '-Wl,-rpath,@executable_path/../lib'")
 ENDIF()
 IF(WIN32)
-   SET (LDFLAGS "${LDFLAGS} -linkmode internal")
+   IF("${MSVC_VERSION}" LESS 1910)
+      SET (LDFLAGS "${LDFLAGS} -linkmode internal")
+   ENDIF()
 ENDIF()
 
 IF(NOT DEFINED GOVERSION)

diff --git a/producer/CMakeLists.txt b/producer/CMakeLists.txt
@@ -9,7 +9,9 @@ IF(APPLE)
   SET (LDFLAGS "-s -extldflags '-Wl,-rpath,@executable_path/../lib'")
 ENDIF()
 IF(WIN32)
-   SET (LDFLAGS "${LDFLAGS} -linkmode internal")
+   IF("${MSVC_VERSION}" LESS 1910)
+      SET (LDFLAGS "${LDFLAGS} -linkmode internal")
+   ENDIF()
 ENDIF()
 
 IF(NOT DEFINED GOVERSION)

diff --git a/service_manager/manager.go b/service_manager/manager.go
@@ -204,11 +204,17 @@ func (m *ServiceMgr) initService() {
 					return
 				}
 
+				cbauthTLScfg, err1 := cbauth.GetTLSConfig()
+				if err1 != nil {
+					logging.Errorf("Error in getting cbauth tls config: %v", err1.Error())
+					return
+				}
+
 				config := &tls.Config{
 					Certificates:             []tls.Certificate{cert},
-					CipherSuites:             []uint16{tls.TLS_RSA_WITH_AES_256_CBC_SHA},
-					MinVersion:               tls.VersionTLS12,
-					PreferServerCipherSuites: true,
+					CipherSuites:             cbauthTLScfg.CipherSuites,
+					MinVersion:               cbauthTLScfg.MinVersion,
+					PreferServerCipherSuites: cbauthTLScfg.PreferServerCipherSuites,
 					ClientAuth:               clientAuthType,
 				}
 

diff --git a/util/n1ql.go b/util/n1ql.go
@@ -189,6 +189,21 @@ func (qs *queryStmt) VisitBuildIndexes(stmt *algebra.BuildIndexes) (interface{},
 	return stmt, err
 }
 
+func (qs *queryStmt) VisitCreateFunction(stmt *algebra.CreateFunction) (interface{}, error) {
+	err := handleStmt(qs, stmt.Expressions())
+	return stmt, err
+}
+
+func (qs *queryStmt) VisitDropFunction(stmt *algebra.DropFunction) (interface{}, error) {
+	err := handleStmt(qs, stmt.Expressions())
+	return stmt, err
+}
+
+func (qs *queryStmt) VisitExecuteFunction(stmt *algebra.ExecuteFunction) (interface{}, error) {
+	err := handleStmt(qs, stmt.Expressions())
+	return stmt, err
+}
+
 func (qs *queryStmt) VisitGrantRole(stmt *algebra.GrantRole) (interface{}, error) {
 	err := handleStmt(qs, stmt.Expressions())
 	return stmt, err