diff options
| -rw-r--r-- | GNUmakefile.mingw | 6 | ||||
| -rw-r--r-- | INSTALL | 15 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/request.c | 7 | ||||
| -rw-r--r-- | src/util.c | 6 |
5 files changed, 14 insertions, 22 deletions
diff --git a/GNUmakefile.mingw b/GNUmakefile.mingw index 1b07fd3..27f3456 100644 --- a/GNUmakefile.mingw +++ b/GNUmakefile.mingw @@ -38,8 +38,8 @@ # -------------------------------------------------------------------------- # Set libs3 version number -LIBS3_VER_MAJOR := trunk -LIBS3_VER_MINOR := trunk +LIBS3_VER_MAJOR := trunk0 +LIBS3_VER_MINOR := trunk0 LIBS3_VER := $(LIBS3_VER_MAJOR).$(LIBS3_VER_MINOR) @@ -117,7 +117,7 @@ install: libs3 s3 headers -@mkdir $(DESTDIR)\include -@mkdir $(DESTDIR)\lib copy $(BUILD)\bin\s3.exe $(DESTDIR)\bin - copy $(BUILD)\lib\libs3.dll $(DESTDIR)\bin + copy $(BUILD)\bin\libs3.dll $(DESTDIR)\bin copy $(BUILD)\lib\libs3.a $(DESTDIR)\lib copy mswin\libs3.def $(DESTDIR)\lib copy $(BUILD)\include\libs3.h $(DESTDIR)\include @@ -39,22 +39,19 @@ To install libs3 on a Microsoft Windows system: is needed. However, the following libraries are needed to build libs3: - curl development libraries - - libxml2 development libraries - - openssl development libraries + - libxml2 development libraries, and the libraries that it requires: + - iconv + - zlib These projects are independent of libs3, and their release schedule and means of distribution would make it very difficult to provide links to the files to download and keep them up-to-date in this file, so no attempt is made here. - curl and libxml2 libraries and their associated files can be placed in: + Development libraries and other files can be placed in: c:\libs3-libs\bin c:\libs3-libs\include - The openssl libraries and associated files can be placed in: - c:\openssl - c:\openssl\include - If the above locations are used, then the GNUmakefile.mingw will work with no special caveats. If the above locations are not used, then the following environment variables should be set: @@ -66,10 +63,6 @@ To install libs3 on a Microsoft Windows system: link in the libxml2 libraries LIBXML2_CFLAGS should be set to the MingW compiler flags needed to locate and include the libxml2 headers - OPENSSL_LIBS should be set to the MingW compiler flags needed to locate and - link in the openssl libraries - OPENSSL_CFLAGS should be set to the MingW compiler flags needed to locate and - include the openssl headers * mingw32-make [DESTDIR=destination] -f GNUmakefile.mingw install @@ -1,5 +1,3 @@ -* Add GNU autoconf support - * Write test case for request_context * Implement service logging support 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); @@ -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; } } |