eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-27 22:37:15 +00:00
Code Activity

Merge branch 'master' into bug3237

Browse Source 
Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
This commit is contained in:
Axel Uhl committed 2015-08-18 16:49:27 +02:00
2 parents 540361b129 8a58e3ccae
commit b9ef73b9ad
29 files changed
+478 -85
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpRequest.java
+1
View File
@@ -76,6 +76,7 @@ public abstract class HttpRequest {
connection.setConnectTimeout(5000);
connection.setReadTimeout(15000);
connection.setRequestProperty("connection", "close");
connection.setRequestProperty("Accept-Encoding", "");
BufferedInputStream responseInputStream = null;
try {