Merge branch '6.0' of https://github.com/lucee/Lucee into 6.0

lucee · Apr 14, 2021 · b5ff668 · b5ff668
2 parents 0d90485 + fb0a129
commit b5ff668
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/core/src/main/java/lucee/runtime/tag/Http.java b/core/src/main/java/lucee/runtime/tag/Http.java
@@ -1431,7 +1431,7 @@ private void ssl(HttpClientBuilder builder) throws PageException {
 		final SSLConnectionSocketFactory sslsf;
 		try {
 			// SSLContext sslcontext = SSLContexts.createSystemDefault();
-			SSLContext sslcontext = SSLContext.getInstance("TLSv1.2");
+			SSLContext sslcontext = SSLContext.getInstance("TLS");
 			if (!StringUtil.isEmpty(this.clientCert)) {
 				if (this.clientCertPassword == null) this.clientCertPassword = "";
 				File ksFile = new File(this.clientCert);

diff --git a/test/tags/Http.cfc b/test/tags/Http.cfc
@@ -56,6 +56,11 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
 		assertEquals(data,res.httpRequestData.content);
 	}
 
-
-
+	public void function testCheckTLSVersion(){
+		http url="https://www.howsmyssl.com/a/check" result="local.res";
+		expect(isJson(res.filecontent)).toBeTrue();
+		var tlsReport = DeserializeJson(res.filecontent);
+		SystemOutput("", true);
+		SystemOutput("CFHTTP is using [#tlsReport.tls_version#] (jvm default)", true);
+	}
 }
diff --git a/test/tickets/LDEV3103.cfc b/test/tickets/LDEV3103.cfc
@@ -6,8 +6,8 @@ component extends = "org.lucee.cfml.test.LuceeTestCase" {
 	function run( testResults, testBox ){
 		describe( "Test case for LDEV-3103", function() {
 			it( title = "check refind", body = function( currentSpec ){
-			    
-			    var startPos=20; 
+
+				var startPos=20; 
 
 var text="[pegdown](https://github.com/sirthias/pegdown). Please see both the [official Markdown website](http://daringfireball.net/projects/markdown/) and the [pegdown repository](https://github.com/sirthias/pegdown) for the supported syntax.
 #### Syntax highlighting:
@@ -22,17 +22,17 @@ echo( x );
 				var referenceRegex = "```([a-z\+]+)?\n(.*?)\n```"; 
  				var match = ReFind( referenceRegex, text, startPos, true ); 
 
-	    		expect(len(match.len)).toBe(3);
+				expect(len(match.len)).toBe(3);
 
-	    		expect(match.len[1]).toBe(18);
-	    		expect(match.len[2]).toBe(0);
-	    		expect(match.len[3]).toBe(10);
+				expect(match.len[1]).toBe(18);
+				expect(match.len[2]).toBe(0);
+				expect(match.len[3]).toBe(10);
 
-	    		expect(match.pos[1]).toBe(265);
-	    		expect(match.pos[2]).toBe(0);
-	    		expect(match.pos[3]).toBe(269);
+				expect(match.pos[1]).toBe(265);
+				expect(match.pos[2]).toBe(0);
+				expect(match.pos[3]).toBe(269);
 
-	    		expect(isNull(match.match[2])).toBe(true);
+				expect(isNull(match.match[2])).toBe(true);
 			});
 		});
 	}