Merge pull request #11 from lightpriest/master

Small backward compatibility to buckets that were managed with original s3fs
tongwang · Feb 14, 2013 · 8c61ca8 · 8c61ca8
2 parents 650f867 + 44453f6
commit 8c61ca8
Show file tree

Hide file tree

Showing 9 changed files with 412 additions and 101 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -14,3 +14,10 @@ Converted the project to be autotools-based.
 
 Rewrite and make it compatible with other tools (s3cmd, AWS Management Console, etc). Supports explicit folder objects (key names end with /) and implicit folders. It is no longer compatible with the original s3fs.
 
+5. memorycraft <memorycraft@gmail.com>
+
+Merge s3fs-1.61 into s3fs-c()1.59.
+
+6. lightpriest <or.cohen007@gmail.com>
+
+Added compatibility for folders that were created by original s3fs (Content-Type: application/x-directory)
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,10 @@
 ChangeLog for S3FS-C
 ------------------
 
+Sep 7, 2011
+
+memorycraft forked s3fs-c, merge from s3fs-1.61. 
+
 Aug 19, 2011
 
 Tong Wang forked s3fs-1.59, made it compatible with other S3 tools. 

diff --git a/README b/README
@@ -2,7 +2,7 @@ S3FS-C
 
 S3FS-C is a FUSE (File System in User Space) based file system backed by Amazon S3 buckets. Once mounted, a S3 bucket can be used just like it was a local file system. 
 
-This project was forked from S3FS (http://code.google.com/p/s3fs/) release 1.59 and being rewritten to be compatible with other S3 clients such as s3cmd, AWS Management Console, etc. Some major differences between S3FS-C and S3FS include:
+This project was forked from S3FS (http://code.google.com/p/s3fs/) release 1.59 (updated to 1.61) and being rewritten to be compatible with other S3 clients such as s3cmd, AWS Management Console, etc. Some major differences between S3FS-C and S3FS include:
 
 * S3FS-C supports folder objects created by AWS Management Console. AWS management Console's folder is a zero-byte object with key that ends with a slash, i.e. "folder_name/". S3FS however uses a different folder scheme: folder is a zero-byte object with it matadata Content-Type set to application/x-directory. 
 * S3FS-C also supports implicit (virtual) folders, folders that do not have any S3 objects to represent them, but are implied by keys of other S3 objects. For example key "abc/def.txt" implies a folder called "abc". That makes S3FS-C compatible with many S3 clients such as s3cmd.