Merge pull request #29 from liuyongqing/master

fix copy action wrong url

Author: jimmyyan

configure.ac

@@ -18,7 +18,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(cosfs, 1.0.11)
+AC_INIT(cosfs, 1.0.12)
 AC_CONFIG_HEADER([config.h])
 
 AC_CANONICAL_SYSTEM

src/curl.cpp

@@ -3292,7 +3292,7 @@ int S3fsCurl::MultipartRenameRequest(const char* from, const char* to, headers_t
   MakeUrlResource(get_realpath(from).c_str(), srcresource, srcurl);
 
   meta["Content-Type"]      = S3fsCurl::LookupMimeType(string(to));
-  meta["x-cos-copy-source"] = srcresource;
+  meta["x-cos-copy-source"] = urlEncode(service_path + bucket + "-" + appid + get_realpath(from));
 
   if(0 != (result = PreMultipartPostRequest(to, meta, upload_id, true))){
     return result;

src/s3fs.cpp

@@ -1189,7 +1189,7 @@ static int rename_object(const char* from, const char* to)
   }
   s3_realpath = get_realpath(from);
 
-  meta["x-cos-copy-source"]        = urlEncode(service_path + bucket + s3_realpath);
+  meta["x-cos-copy-source"]        = urlEncode(service_path + bucket + "-" + appid + s3_realpath);
   meta["Content-Type"]             = S3fsCurl::LookupMimeType(string(to));
   meta["x-cos-metadata-directive"] = "REPLACE";
 
@@ -3112,7 +3112,7 @@ static int s3fs_setxattr(const char* path, const char* name, const char* value,
   }
 
   // set xattr all object
-  meta["x-cos-copy-source"]        = urlEncode(service_path + bucket + get_realpath(strpath.c_str()));
+  meta["x-cos-copy-source"]        = urlEncode(service_path + bucket + "-" + appid + get_realpath(strpath.c_str()));
   meta["x-cos-metadata-directive"] = "REPLACE";
 
   if(0 != put_headers(strpath.c_str(), meta, true)){
@@ -3375,7 +3375,7 @@ static int s3fs_removexattr(const char* path, const char* name)
   }
 
   // set xattr all object
-  meta["x-cos-copy-source"]        = urlEncode(service_path + bucket + get_realpath(strpath.c_str()));
+  meta["x-cos-copy-source"]        = urlEncode(service_path + bucket + "-" + appid + get_realpath(strpath.c_str()));
   meta["x-cos-metadata-directive"] = "REPLACE";
 
   if(0 != put_headers(strpath.c_str(), meta, true)){