From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/utils/ConnectionUtils.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/utils/ConnectionUtils.java b/src/main/java/com/gitblit/utils/ConnectionUtils.java
index f0b4111..b2bd060 100644
--- a/src/main/java/com/gitblit/utils/ConnectionUtils.java
+++ b/src/main/java/com/gitblit/utils/ConnectionUtils.java
@@ -38,9 +38,9 @@
/**
* Utility class for establishing HTTP/HTTPS connections.
- *
+ *
* @author James Moger
- *
+ *
*/
public class ConnectionUtils {
@@ -61,6 +61,10 @@
SSL_CONTEXT = context;
HOSTNAME_VERIFIER = new DummyHostnameVerifier();
CHARSET = "UTF-8";
+
+ // Disable Java 7 SNI checks
+ // http://stackoverflow.com/questions/7615645/ssl-handshake-alert-unrecognized-name-error-since-upgrade-to-java-1-7-0
+ System.setProperty("jsse.enableSNIExtension", "false");
}
public static void setAuthorization(URLConnection conn, String username, char[] password) {
@@ -93,7 +97,7 @@
}
return conn;
}
-
+
// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -179,7 +183,7 @@
/**
* DummyTrustManager trusts all certificates.
- *
+ *
* @author James Moger
*/
private static class DummyTrustManager implements X509TrustManager {
@@ -202,7 +206,7 @@
/**
* Trusts all hostnames from a certificate, including self-signed certs.
- *
+ *
* @author James Moger
*/
private static class DummyHostnameVerifier implements HostnameVerifier {
--
Gitblit v1.9.1