pic.twitter.com への画像アップロードのタイムアウト設定を1分とする

diff --git a/OpenTween.Tests/Connection/TwitterApiConnectionTest.cs b/OpenTween.Tests/Connection/TwitterApiConnectionTest.cs
index 763e85c..a897a9f 100644 (file)
--- a/OpenTween.Tests/Connection/TwitterApiConnectionTest.cs
+++ b/OpenTween.Tests/Connection/TwitterApiConnectionTest.cs
@@ -340,7 +340,7 @@ namespace OpenTween.Connection
             using (var http = new HttpClient(mockHandler))
             using (var apiConnection = new TwitterApiConnection("", ""))
             {
-                apiConnection.http = http;
+                apiConnection.httpUpload = http;
 
                 using (var image = TestUtils.CreateDummyImage())
                 using (var media = new MemoryImageMediaItem(image))
@@ -415,7 +415,7 @@ namespace OpenTween.Connection
             using (var http = new HttpClient(mockHandler))
             using (var apiConnection = new TwitterApiConnection("", ""))
             {
-                apiConnection.http = http;
+                apiConnection.httpUpload = http;
 
                 mockHandler.Enqueue(async x =>
                 {

diff --git a/OpenTween/Connection/TwitterApiConnection.cs b/OpenTween/Connection/TwitterApiConnection.cs
index 4bbe61f..c08d1d2 100644 (file)
--- a/OpenTween/Connection/TwitterApiConnection.cs
+++ b/OpenTween/Connection/TwitterApiConnection.cs
@@ -53,6 +53,7 @@ namespace OpenTween.Connection
         public string AccessSecret { get; }
 
         internal HttpClient http;
+        internal HttpClient httpUpload;
         internal HttpClient httpStreaming;
 
         public TwitterApiConnection(string accessToken, string accessSecret)
@@ -68,6 +69,9 @@ namespace OpenTween.Connection
         {
             this.http = InitializeHttpClient(this.AccessToken, this.AccessSecret);
 
+            this.httpUpload = InitializeHttpClient(this.AccessToken, this.AccessSecret);
+            this.httpUpload.Timeout = TimeSpan.FromMinutes(1);
+
             this.httpStreaming = InitializeHttpClient(this.AccessToken, this.AccessSecret, disableGzip: true);
             this.httpStreaming.Timeout = Timeout.InfiniteTimeSpan;
         }
@@ -223,7 +227,7 @@ namespace OpenTween.Connection
                 HttpResponseMessage response = null;
                 try
                 {
-                    response = await this.http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead)
+                    response = await this.httpUpload.SendAsync(request, HttpCompletionOption.ResponseHeadersRead)
                         .ConfigureAwait(false);
 
                     await this.CheckStatusCode(response)