MS autodiscover priorities DNS over subdomain

Author: the-djmaze

snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php

@@ -168,16 +168,6 @@ private static function srv(string $domain) : ?array
 	 */
 	private static function autodiscover(string $domain) : ?array
 	{
-		foreach ([
-			"https://{$domain}",
-			"https://autodiscover.{$domain}",
-			"http://autodiscover.{$domain}"
-		] as $host) {
-			$result = static::autodiscover_resolve($host, $domain);
-			if ($result) {
-				return $result;
-			}
-		}
 		foreach (\SnappyMail\DNS::SRV("_autodiscover._tcp.{$domain}") as $record) {
 			if (443 == $record['port']) {
 				$result = static::autodiscover_resolve("https://{$record['target']}", $domain);
@@ -190,6 +180,16 @@ private static function autodiscover(string $domain) : ?array
 				return $result;
 			}
 		}
+		foreach ([
+			"https://{$domain}",
+			"https://autodiscover.{$domain}",
+			"http://autodiscover.{$domain}"
+		] as $host) {
+			$result = static::autodiscover_resolve($host, $domain);
+			if ($result) {
+				return $result;
+			}
+		}
 		return null;
 	}