fix cfug#1452

BilalAlpaslan · Mar 31, 2022 · ac78e61 · ac78e61
1 parent f56ce11
commit ac78e61
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/README-ZH.md b/README-ZH.md
@@ -13,7 +13,7 @@ dio是一个强大的Dart Http请求库，支持Restful API、FormData、拦截
 
 ```yaml
 dependencies:
-  dio: ^4.0.5
+  dio: ^4.0.6
 ```
 
 > 如果你是dio 3.x 用户，想了解4.0的变更，请参考 [4.x更新列表](./migration_to_4.x.md)!

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ A powerful Http client for Dart, which supports Interceptors, Global configurati
 
 ```yaml
 dependencies:
-  dio: ^4.0.5
+  dio: ^4.0.6
 ```
 > Already know Dio 3 and just want to learn about what's new in Dio 4? Check out the [Migration Guide](./migration_to_4.x.md)!
 

diff --git a/dio/CHANGELOG.md b/dio/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 4.0.6
+- fix #1452
+
 # 4.0.5
 - require Dart `2.12.1` which fixes exception handling for secure socket connections (https://github.com/dart-lang/sdk/issues/45214)
 - Only delete file if it exists when downloading.

diff --git a/dio/README-ZH.md b/dio/README-ZH.md
@@ -13,7 +13,7 @@ dio是一个强大的Dart Http请求库，支持Restful API、FormData、拦截
 
 ```yaml
 dependencies:
-  dio: ^4.0.5
+  dio: ^4.0.6
 ```
 
 > 如果你是dio 3.x 用户，想了解4.0的变更，请参考 [4.x更新列表](./migration_to_4.x.md)!

diff --git a/dio/README.md b/dio/README.md
@@ -12,7 +12,7 @@ A powerful Http client for Dart, which supports Interceptors, Global configurati
 
 ```yaml
 dependencies:
-  dio: ^4.0.5
+  dio: ^4.0.6
 ```
 > Already know Dio 3 and just want to learn about what's new in Dio 4? Check out the [Migration Guide](./migration_to_4.x.md)!
 

diff --git a/dio/lib/src/adapters/io_adapter.dart b/dio/lib/src/adapters/io_adapter.dart
@@ -44,6 +44,7 @@ class DefaultHttpClientAdapter implements HttpClientAdapter {
 
     late HttpClientRequest request;
     try {
+      request = await reqFuture;
       if (options.connectTimeout > 0) {
         request = await reqFuture
             .timeout(Duration(milliseconds: options.connectTimeout));
@@ -61,7 +62,6 @@ class DefaultHttpClientAdapter implements HttpClientAdapter {
       }
       rethrow;
     } on TimeoutException {
-      request.abort();
       _throwConnectingTimeout();
     }
 
@@ -97,15 +97,11 @@ class DefaultHttpClientAdapter implements HttpClientAdapter {
     try {
       responseStream = await future;
     } on TimeoutException {
-      try {
-        await responseStream.detachSocket();
-      } finally {
-        throw DioError(
-          requestOptions: options,
-          error: 'Receiving data timeout[${options.receiveTimeout}ms]',
-          type: DioErrorType.receiveTimeout,
-        );
-      }
+      throw DioError(
+        requestOptions: options,
+        error: 'Receiving data timeout[${options.receiveTimeout}ms]',
+        type: DioErrorType.receiveTimeout,
+      );
     }
 
     var stream =

diff --git a/dio/pubspec.yaml b/dio/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dio
 description: A powerful Http client for Dart, which supports Interceptors, FormData, Request Cancellation, File Downloading, Timeout etc.
-version: 4.0.5
+version: 4.0.6
 homepage: https://github.com/flutterchina/dio
 
 environment: