Merge e8fd1d5 into ae04449

justafish · Apr 6, 2017 · 8362d38 · 8362d38
2 parents ae04449 + e8fd1d5
commit 8362d38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/StreamWrapper.php b/src/StreamWrapper.php
@@ -251,6 +251,7 @@ public function getExternalUrl() {
 
       // Generate a standard URL.
       $url = $this->getS3Url($path, $expiry, $args);
+      $url->setPath('/'. $path);
     }
 
     return (string) $url;

diff --git a/src/StreamWrapperConfiguration.php b/src/StreamWrapperConfiguration.php
@@ -112,11 +112,8 @@ protected static function required() {
    */
   protected static function getS3Domain($bucket) {
     $domain = StreamWrapper::S3_API_DOMAIN;
-    // If the bucket does not contain dots, the S3 SDK generates URLs that
-    // use the bucket name in the host.
-    if (strpos($bucket, '.') === FALSE) {
-      $domain = $bucket . '.' . $domain;
-    }
+
+    $domain = $bucket . '.' . $domain;
 
     return $domain;
   }