* Integrated revisions 86:88 from 0.6 branch, which were fixes applied on the

  branch relevent to trunk
* Also some minor cleanups

2 files changed, 7 insertions, 6 deletions

diff --git a/src/request.c b/src/request.c
index c417eb8..57b2f54 100644
--- a/src/request.c
+++ b/src/request.c
@@ -184,8 +184,7 @@ static size_t curl_read_func(void *ptr, size_t size, size_t nmemb, void *data)
         }
     }
     else {
-        request->status = S3StatusInternalError;
-        return CURL_READFUNC_ABORT;
+        return 0;
     }
 }
 
@@ -863,6 +862,10 @@ static S3Status setup_curl(Request *request,
         request->headers = curl_slist_append(request->headers, 
                                              "Transfer-Encoding:");
     }
+    else if (params->httpRequestType == HttpRequestTypeCOPY) {
+        request->headers = curl_slist_append(request->headers, 
+                                             "Transfer-Encoding:");
+    }
     
     append_standard_header(cacheControlHeader);
     append_standard_header(contentTypeHeader);
diff --git a/src/util.c b/src/util.c
index 3b1e39f..3f1a9c9 100644
--- a/src/util.c
+++ b/src/util.c
@@ -503,8 +503,7 @@ uint64_t hash(const unsigned char *k, int length)
         case 4 : a += ((uint32_t) k[3]) << 24;
         case 3 : a += ((uint32_t) k[2]) << 16;
         case 2 : a += ((uint32_t) k[1]) << 8;
-        case 1 : a += k[0];
-            break;
+        case 1 : a += k[0]; break;
         case 0 : goto end;
         }
     }
@@ -544,8 +543,7 @@ uint64_t hash(const unsigned char *k, int length)
         case 4 : a += k[3];
         case 3 : a += ((uint32_t) k[2]) << 8;
         case 2 : a += ((uint32_t) k[1]) << 16;
-        case 1 : a += ((uint32_t) k[0]) << 24;
-            break;
+        case 1 : a += ((uint32_t) k[0]) << 24; break;
         case 0 : goto end;
         }
     }