Send "Conflict" message body with 409 responses (closes #409)

2016-06-02 13:09:05 +02:00
parent 9a9a9c79e5
commit 83d8f29a04
2 changed files with 2 additions and 1 deletions
--- a/lib/remote_storage/swift.rb
+++ b/lib/remote_storage/swift.rb
@@ -133,7 +133,7 @@ module RemoteStorage

    def put_data(user, directory, key, data, content_type)
      server.halt 400 if server.env["HTTP_CONTENT_RANGE"]
-      server.halt 409 if has_name_collision?(user, directory, key)
+      server.halt 409, "Conflict" if has_name_collision?(user, directory, key)

      existing_metadata = redis.hgetall redis_metadata_object_key(user, directory, key)
      url = url_for_key(user, directory, key)