Include operation timeout to prevent getting stuck if TLS connection

cannot be verified because of missing CA certificate
owncloud · Feb 17, 2020 · ff16e16 · ff16e16
1 parent 7615279
commit ff16e16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/lib/Connection.php b/lib/Connection.php
@@ -598,6 +598,7 @@ private function doConnect($host, $port) {
 		}
 		// Set network timeout threshold to avoid long delays when ldap server cannot be resolved
 		$this->getLDAP()->setOption($this->ldapConnectionRes, LDAP_OPT_NETWORK_TIMEOUT, \intval($this->configuration->ldapNetworkTimeout));
+		$this->getLDAP()->setOption($this->ldapConnectionRes, LDAP_OPT_TIMEOUT, \intval($this->configuration->ldapNetworkTimeout));
 		if (!$this->getLDAP()->isResource($this->ldapConnectionRes)) {
 			$this->ldapConnectionRes = null; // to indicate it really is not set, connect() might have set it to false
 			throw new ServerNotAvailableException("Connect to $host:$port failed");

diff --git a/lib/Wizard.php b/lib/Wizard.php
@@ -1176,6 +1176,7 @@ private function getConnection() {
 		$this->getLDAP()->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3);
 		$this->getLDAP()->setOption($cr, LDAP_OPT_REFERRALS, 0);
 		$this->getLDAP()->setOption($cr, LDAP_OPT_NETWORK_TIMEOUT, self::LDAP_NW_TIMEOUT);
+		$this->getLDAP()->setOption($cr, LDAP_OPT_TIMEOUT, self::LDAP_NW_TIMEOUT);
 		if ($this->configuration->ldapTLS) {
 			$this->getLDAP()->startTls($cr);
 		}