Merge 6d6420b into 1a9891f

mattermost · Feb 2, 2017 · 0d2e939 · 0d2e939
2 parents 1a9891f + 6d6420b
commit 0d2e939
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/api/post.go b/api/post.go
@@ -1120,7 +1120,8 @@ func sendToPushProxy(msg model.PushNotification) {
 	msg.ServerId = utils.CfgDiagnosticId
 
 	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: *utils.Cfg.ServiceSettings.EnableInsecureOutgoingConnections},
+		TLSClientConfig:   &tls.Config{InsecureSkipVerify: *utils.Cfg.ServiceSettings.EnableInsecureOutgoingConnections},
+		DisableKeepAlives: true,
 	}
 	httpClient := &http.Client{Transport: tr}
 	request, _ := http.NewRequest("POST", *utils.Cfg.EmailSettings.PushNotificationServer+model.API_URL_SUFFIX_V1+"/send_push", strings.NewReader(msg.ToJson()))

diff --git a/webapp/package.json b/webapp/package.json
@@ -36,6 +36,7 @@
     "xregexp": "3.1.1"
   },
   "devDependencies": {
+    "acorn": "4.0.4",
     "babel-core": "6.18.2",
     "babel-eslint": "7.1.0",
     "babel-loader": "6.2.7",