Merge branch 'v1.0.21' into 'v1.0.21' (merge request !4)

enable content md5 by default

Author: yongqingliu

src/curl.cpp

@@ -294,7 +294,7 @@ storage_class_t  S3fsCurl::storage_class       = STANDARD;
 sseckeylist_t    S3fsCurl::sseckeys;
 std::string      S3fsCurl::ssekmsid            = "";
 sse_type_t       S3fsCurl::ssetype             = SSE_DISABLE;
-bool             S3fsCurl::is_content_md5      = false;
+bool             S3fsCurl::is_content_md5      = true;
 bool             S3fsCurl::is_verbose          = false;
 string           S3fsCurl::COSAccessKeyId;
 string           S3fsCurl::COSSecretAccessKey;

src/s3fs.cpp

@@ -4939,6 +4939,10 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
       S3fsCurl::SetContentMd5(true);
       return 0;
     }
+    if(0 == strcmp(arg, "disable_content_md5")){
+      S3fsCurl::SetContentMd5(false);
+      return 0;
+    }
     if(0 == STR2NCMP(arg, "url=")){
       host = strchr(arg, '=') + sizeof(char);
       // strip the trailing '/', if any, off the end of the host

src/s3fs_util.cpp

@@ -1028,8 +1028,8 @@ void show_help (void)
     "\n"
     "   nomultipart (disable multipart uploads)\n"
     "\n"
-    "   enable_content_md5 (default is disable)\n"
-    "      - ensure data integrity during writes with MD5 hash.\n"
+    "   disable_content_md5 (md5 default is enabled)\n"
+    "      - content md5 will ensure data integrity during upload with MD5 hash.\n"
     "\n"
     "\n"
     "   nocopyapi (for other incomplete compatibility object storage)\n"