From caf173ab903d993aebdf137f3ca64f1ca73b74dc Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 7 Mar 2019 13:32:30 +0100
Subject: [locationinfo] Introduce timeouts for curl operations

---
 .../locationinfo/inc/coursebackend/coursebackend_davinci.inc.php   | 2 ++
 .../locationinfo/inc/coursebackend/coursebackend_exchange.inc.php  | 2 ++
 .../locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php  | 7 ++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'modules-available/locationinfo')

diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
index 2b2b9d00..0307a044 100644
--- a/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
@@ -83,6 +83,8 @@ class CourseBackend_Davinci extends CourseBackend
 			CURLOPT_SSL_VERIFYHOST => $this->verifyHostname ? 2 : 0,
 			CURLOPT_SSL_VERIFYPEER => $this->verifyCert ? 1 : 0,
 			CURLOPT_URL => $url,
+			CURLOPT_TIMEOUT => 15,
+			CURLOPT_CONNECTTIMEOUT => 3,
 		);
 
 		curl_setopt_array($this->curlHandle, $options);
diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php
index c61c3f2f..ffbca17f 100755
--- a/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php
@@ -234,6 +234,8 @@ class CourseBackend_Exchange extends CourseBackend
 		$client->setCurlOptions(array(
 			CURLOPT_SSL_VERIFYPEER => $this->verifyHostname ? 2 : 0,
 			CURLOPT_SSL_VERIFYHOST => $this->verifyCert ? 1 : 0,
+			CURLOPT_TIMEOUT => 15,
+			CURLOPT_CONNECTTIMEOUT => 3,
 		));
 
 		return $client;
diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php
index 809634ad..7f84dd92 100644
--- a/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php
@@ -174,9 +174,8 @@ class CourseBackend_HisInOne extends CourseBackend
 	private function postToServer($request, $action)
 	{
 		$header = array(
-			"Content-type: text/xml;charset=\"utf-8\"",
-			"SOAPAction: \"" . $action . "\"",
-			"Content-length: " . strlen($request),
+			'Content-type: text/xml;charset="utf-8"',
+			'SOAPAction: "' . $action . '"',
 		);
 
 		if ($this->curlHandle === false) {
@@ -191,6 +190,8 @@ class CourseBackend_HisInOne extends CourseBackend
 			CURLOPT_URL => $this->location,
 			CURLOPT_POSTFIELDS => $request,
 			CURLOPT_HTTPHEADER => $header,
+			CURLOPT_TIMEOUT => 15,
+			CURLOPT_CONNECTTIMEOUT => 3,
 		);
 
 		curl_setopt_array($this->curlHandle, $options);
-- 
cgit v1.2.3-55-g7522