Commit 4d1782f7 authored by Honfika's avatar Honfika

fix

parent 20424032
...@@ -73,9 +73,9 @@ namespace Titanium.Web.Proxy.Http ...@@ -73,9 +73,9 @@ namespace Titanium.Web.Proxy.Http
var buf = ArrayPool<byte>.Shared.Rent(str.Length * 4); var buf = ArrayPool<byte>.Shared.Rent(str.Length * 4);
var span = new Span<byte>(buf); var span = new Span<byte>(buf);
encoding.GetBytes(str.AsSpan(), span); int bytes = encoding.GetBytes(str.AsSpan(), span);
stream.Write(span); stream.Write(span.Slice(0, bytes));
ArrayPool<byte>.Shared.Return(buf); ArrayPool<byte>.Shared.Return(buf);
#else #else
var data = encoding.GetBytes(str); var data = encoding.GetBytes(str);
......
...@@ -157,12 +157,7 @@ namespace Titanium.Web.Proxy.Http ...@@ -157,12 +157,7 @@ namespace Titanium.Web.Proxy.Http
{ {
var headerBuilder = new HeaderBuilder(); var headerBuilder = new HeaderBuilder();
headerBuilder.WriteRequestLine(Method, RequestUriString, HttpVersion); headerBuilder.WriteRequestLine(Method, RequestUriString, HttpVersion);
foreach (var header in Headers) headerBuilder.WriteHeaders(Headers);
{
headerBuilder.WriteHeader(header);
}
headerBuilder.WriteLine();
return HttpHelper.HeaderEncoding.GetString(headerBuilder.GetBytes()); return HttpHelper.HeaderEncoding.GetString(headerBuilder.GetBytes());
} }
} }
......
...@@ -37,7 +37,7 @@ namespace Titanium.Web.Proxy.Http ...@@ -37,7 +37,7 @@ namespace Titanium.Web.Proxy.Http
/// <summary> /// <summary>
/// Response Status description. /// Response Status description.
/// </summary> /// </summary>
public string StatusDescription { get; set; } public string StatusDescription { get; set; } = string.Empty;
/// <summary> /// <summary>
/// Has response body? /// Has response body?
...@@ -122,11 +122,6 @@ namespace Titanium.Web.Proxy.Http ...@@ -122,11 +122,6 @@ namespace Titanium.Web.Proxy.Http
} }
} }
internal static string CreateResponseLine(Version version, int statusCode, string statusDescription)
{
return $"HTTP/{version.Major}.{version.Minor} {statusCode} {statusDescription}";
}
internal static void ParseResponseLine(string httpStatus, out Version version, out int statusCode, internal static void ParseResponseLine(string httpStatus, out Version version, out int statusCode,
out string statusDescription) out string statusDescription)
{ {
......
...@@ -15,7 +15,7 @@ namespace Titanium.Web.Proxy.Http.Responses ...@@ -15,7 +15,7 @@ namespace Titanium.Web.Proxy.Http.Responses
public GenericResponse(HttpStatusCode status) public GenericResponse(HttpStatusCode status)
{ {
StatusCode = (int)status; StatusCode = (int)status;
StatusDescription = Get(StatusCode); StatusDescription = Get(StatusCode) ?? string.Empty;
} }
/// <summary> /// <summary>
...@@ -98,6 +98,7 @@ namespace Titanium.Web.Proxy.Http.Responses ...@@ -98,6 +98,7 @@ namespace Titanium.Web.Proxy.Http.Responses
case 510: return "Not Extended"; case 510: return "Not Extended";
case 511: return "Network Authentication Required"; case 511: return "Network Authentication Required";
} }
return null; return null;
} }
} }
......
...@@ -259,6 +259,7 @@ namespace Titanium.Web.Proxy.Http2 ...@@ -259,6 +259,7 @@ namespace Titanium.Web.Proxy.Http2
response.HttpVersion = HttpVersion.Version20; response.HttpVersion = HttpVersion.Version20;
int.TryParse(headerListener.Status, out int statusCode); int.TryParse(headerListener.Status, out int statusCode);
response.StatusCode = statusCode; response.StatusCode = statusCode;
response.StatusDescription = string.Empty;
} }
} }
catch (Exception ex) catch (Exception ex)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<SignAssembly>True</SignAssembly> <SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<LangVersion>7.1</LangVersion> <LangVersion>8.0</LangVersion>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
</PropertyGroup> </PropertyGroup>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>False</DelaySign> <DelaySign>False</DelaySign>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<LangVersion>7.1</LangVersion> <LangVersion>8.0</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>False</DelaySign> <DelaySign>False</DelaySign>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<LangVersion>7.1</LangVersion> <LangVersion>8.0</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment