apply pull request jubos#88 from jubos/fake-s3 (by Allactaga)

lib/fakes3/server.rb

@@ -50,6 +50,8 @@ def initialize(server,store,hostname)
       @hostname = hostname
       @port = server.config[:Port]
       @root_hostnames = [hostname,'localhost','s3.amazonaws.com','s3.localhost']
+      escaped_hostnames = @root_hostnames.map { |host| Regexp.escape(host) }
+      @bucket_host_regex = Regexp.new('^(.*?)\.(?:%s)$' % escaped_hostnames.join('|'))
     end
 
     def validate_request(request)
@@ -466,7 +468,7 @@ def normalize_request(webrick_req)
       s_req.is_path_style = true
 
       if !@root_hostnames.include?(host)
-        s_req.bucket = host.split(".")[0]
+        s_req.bucket = @bucket_host_regex.match(host)[1]
         s_req.is_path_style = false
       end