Skip to content

Commit

Permalink
Removed set of Content-Encoding on request
Browse files Browse the repository at this point in the history
per http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.5
    this should be (identity|deflate|compress|gzip), and identity is the default if not specified.
    The HttpContentEncoding class is renamed to HttpContentTransferEncoding and updated with missing values
  • Loading branch information
Peter T. LaComb Jr committed Jun 12, 2015
1 parent f94d466 commit 82843f2
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 29 deletions.
2 changes: 1 addition & 1 deletion src/EasyHttp/EasyHttp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<Compile Include="Configuration\IEncoderDecoderConfiguration.cs" />
<Compile Include="Http\CacheControl.cs" />
<Compile Include="Http\HttpClient.cs" />
<Compile Include="Http\HttpContentEncoding.cs" />
<Compile Include="Http\HttpContentTransferEncoding.cs" />
<Compile Include="Http\HttpContentTypes.cs" />
<Compile Include="Http\HttpMethod.cs" />
<Compile Include="Http\HttpRequest.cs" />
Expand Down
1 change: 0 additions & 1 deletion src/EasyHttp/Http/HttpClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ void InitData(object data, string contentType)
{
Request.ContentType = contentType;
Request.Data = data;
Request.ContentEncoding = HttpContentEncoding.Utf8;
}
}

Expand Down
9 changes: 0 additions & 9 deletions src/EasyHttp/Http/HttpContentEncoding.cs

This file was deleted.

11 changes: 11 additions & 0 deletions src/EasyHttp/Http/HttpContentTransferEncoding.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace EasyHttp.Http
{
public static class HttpContentTransferEncoding
{
public const string Bit8 = "8bit";
public const string Bit7 = "7bit";
public const string QuotedPrintable = "quoted-printable";
public const string Binary = "binary";
public const string Base64 = "base64";
}
}
4 changes: 2 additions & 2 deletions src/EasyHttp/Http/MultipartStreamer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ static void StreamFileContents(Stream file, FileData fileData, Stream requestStr

while ((count = file.Read(buffer, 0, buffer.Length)) > 0)
{
if (fileData.ContentTransferEncoding == HttpContentEncoding.Base64)
if (fileData.ContentTransferEncoding == HttpContentTransferEncoding.Base64)
{
string str = Convert.ToBase64String(buffer, 0, count);

requestStream.WriteString(str);
}
else if (fileData.ContentTransferEncoding == HttpContentEncoding.Binary)
else if (fileData.ContentTransferEncoding == HttpContentTransferEncoding.Binary)
{
requestStream.Write(buffer, 0, count);
}
Expand Down
32 changes: 16 additions & 16 deletions src/EasyHttp/Infrastructure/FileData.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
using EasyHttp.Http;

namespace EasyHttp.Infrastructure
{
public class FileData
{
public string FieldName { get; set; }
public string Filename { get; set; }
public string ContentType { get; set; }
public string ContentTransferEncoding { get; set; }

public FileData()
{
ContentTransferEncoding = HttpContentEncoding.Binary;
}
}
using EasyHttp.Http;

namespace EasyHttp.Infrastructure
{
public class FileData
{
public string FieldName { get; set; }
public string Filename { get; set; }
public string ContentType { get; set; }
public string ContentTransferEncoding { get; set; }

public FileData()
{
ContentTransferEncoding = HttpContentTransferEncoding.Binary;
}
}
}

0 comments on commit 82843f2

Please sign in to comment.