Skip to content

Allow user to toggle Connection header #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Allow user to toggle Connection header #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d2b4ea
Add KeepAlive flag to allow toggle between Keep-Alive/close Connectio…
Aug 10, 2017
32eea5b
Removed unnecessary using
Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/AwsHttpConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Net.Http;

Expand All @@ -12,13 +12,16 @@ public class AwsHttpConnection : HttpConnection
private readonly ICredentialsProvider _credentialsProvider;
private readonly string _region;

public bool KeepAlive { get; set; }

/// <summary>
/// Initializes a new instance of the AwsHttpConnection class with the specified AccessKey, SecretKey and Token.
/// </summary>
/// <param name="awsSettings">AWS specific settings required for signing requests.</param>
[Obsolete("Use AwsHttpConnection(string region, ICredentialsProvider credentialsProvider)")]
public AwsHttpConnection(AwsSettings awsSettings)
{
KeepAlive = false;
if (awsSettings == null) throw new ArgumentNullException(nameof(awsSettings));
if (string.IsNullOrWhiteSpace(awsSettings.Region)) throw new ArgumentException("awsSettings.Region is invalid.", nameof(awsSettings));
_region = awsSettings.Region.ToLowerInvariant();
Expand All @@ -41,7 +44,6 @@ public AwsHttpConnection(string region)
{
}


/// <summary>
/// Initializes a new instance of the AwsHttpConnection class with credentials from the Instance Profile service
/// </summary>
Expand All @@ -60,13 +62,17 @@ public AwsHttpConnection(string region, ICredentialsProvider credentialsProvider
protected override System.Net.HttpWebRequest CreateHttpWebRequest(RequestData requestData)
{
var request = base.CreateHttpWebRequest(requestData);
request.Headers.Remove("Connection");
Copy link
Author

@troylar troylar Aug 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is duplicate code, but the request object is different for both methods.

request.Headers.Add("Connection", KeepAlive ? "Keep-Alive" : "close");
SignRequest(new HttpWebRequestAdapter(request), requestData);
return request;
}
#else
protected override HttpRequestMessage CreateHttpRequestMessage(RequestData requestData)
{
var request = base.CreateHttpRequestMessage(requestData);
request.Headers.Remove("Connection");
request.Headers.Add("Connection", KeepAlive ? "Keep-Alive" : "close");
SignRequest(new HttpRequestMessageAdapter(request), requestData);
return request;
}
Expand Down Expand Up @@ -95,3 +101,4 @@ private void SignRequest(IRequest request, RequestData requestData)
}
}
}