Don't use hostname buckets for SSL (fixes #104)

tpyo · tpyo · commit f363dd4c89af · 2015-03-17T23:42:34.000+02:00
diff --git a/S3.php b/S3.php
@@ -2306,6 +2306,7 @@ private function __responseWriteCallback(&$curl, &$data)
 	private function __dnsBucketName($bucket)
 	{
 		if (strlen($bucket) > 63 || preg_match("/[^a-z0-9\.-]/", $bucket) > 0) return false;
+		if (S3::$useSSL && strstr($bucket, '.') !== false) return false;
 		if (strstr($bucket, '-.') !== false) return false;
 		if (strstr($bucket, '..') !== false) return false;
 		if (!preg_match("/^[0-9a-z]/", $bucket)) return false;

Original file line number	Diff line number	Diff line change
`@@ -2306,6 +2306,7 @@ private function __responseWriteCallback(&$curl, &$data)`
`2306`	`2306`	`private function __dnsBucketName($bucket)`
`2307`	`2307`	`{`
`2308`	`2308`	`if (strlen($bucket) > 63 \|\| preg_match("/[^a-z0-9\.-]/", $bucket) > 0) return false;`
	`2309`	`+ if (S3::$useSSL && strstr($bucket, '.') !== false) return false;`
`2309`	`2310`	`if (strstr($bucket, '-.') !== false) return false;`
`2310`	`2311`	`if (strstr($bucket, '..') !== false) return false;`
`2311`	`2312`	`if (!preg_match("/^[0-9a-z]/", $bucket)) return false;`