Merge pull request #336 from YangSen-qn/dns_develop

v 7.4.1

Author: bachue

CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changelog
 
+## 7.4.1 (2020-06-29)
+## 修正
+处理内存泄漏
+
 ## 7.4.0 (2020-06-09)
 ## 增加
 新增Dns预解析功能，上传请求大概率跳过Dns解析步骤，提高上传质量。

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '7.4.0'
+  s.version      = '7.4.1'
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'

QiniuDemo/Podfile

@@ -6,6 +6,6 @@ target "QiniuDemo" do
 end
 
 target "QiniuDemoTests" do
-  platform :ios, "7.0"
-  pod 'Qiniu',:path => '../'
+#  platform :ios, "7.0"
+#  pod 'Qiniu',:path => '../'
 end

QiniuSDK/Common/QNFixedZone.h

@@ -51,7 +51,6 @@ NS_ASSUME_NONNULL_BEGIN
  *    Zone初始化方法
  *
  *    @param upList     默认上传服务器地址列表
- *    @param zoneRegion 区域
  *    @return Zone实例
  */
 - (instancetype)initWithupDomainList:(NSArray<NSString *> *)upList;

QiniuSDK/Http/QNSessionManager.m

@@ -74,6 +74,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task
     _sessionStatistics.bytesSent = task.countOfBytesSent;
     _sessionStatistics.bytesTotal = task.countOfBytesExpectedToSend;
     self.completeBlock(_responseData, task.response, error, _sessionStatistics);
+    [session finishTasksAndInvalidate];
 }
 
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didFinishCollectingMetrics:(NSURLSessionTaskMetrics *)metrics  API_AVAILABLE(ios(10.0)) {

QiniuSDK/Http/UrlProtocol/NSURLRequest+QNRequest.m

@@ -100,9 +100,8 @@ - (void)setQn_domain:(NSString *)qn_domain{
     } else {
         [self setValue:nil forHTTPHeaderField:kQNURLReuestHostKey];
     }
-    
-    NSTimeInterval timestamp = [[NSDate date] timeIntervalSince1970];
-    NSString *identifier = [NSString stringWithFormat:@"%lf%@", timestamp, qn_domain];
+
+    NSString *identifier = [NSString stringWithFormat:@"%p-%@", &self, qn_domain];
     [self setQn_identifier:identifier];
 }
 

QiniuSDK/Http/UrlProtocol/QNURLProtocol.m

@@ -14,8 +14,8 @@
 #import <objc/runtime.h>
 
 @interface QNRequestInfo : NSObject
-@property(nonatomic, strong)NSURLSession *session;
-@property(nonatomic, strong)NSURLSessionDataTask *task;
+@property(nonatomic, weak)NSURLSession *session;
+@property(nonatomic, weak)NSURLSessionDataTask *task;
 @end
 @implementation QNRequestInfo
 @end
@@ -88,7 +88,7 @@ - (void)qn_setSession:(NSURLSession *)session task:(NSURLSessionDataTask *)task{
     info.task = task;
     [[QNRequestInfoManager share] setRequestInfo:info forRequest:self];
 }
-- (void)qn_requestComplete{
+- (void)qn_requestRemoveTask{
     [[QNRequestInfoManager share] removeRequestInfoForRequest:self];
 }
 - (BOOL)qnHttps_shouldInit{
@@ -154,6 +154,7 @@ + (BOOL)canInitWithRequest:(NSURLRequest *)request {
         && address.ipValue && address.ipValue.length > 0) {
         return YES;
     } else {
+        [request qn_requestRemoveTask];
         return NO;
     }
 }
@@ -225,7 +226,7 @@ - (void)didSendBodyData:(int64_t)bytesSent
 - (void)didFinish {
 
     [self.client URLProtocolDidFinishLoading:self];
-    [self.request qn_requestComplete];
+    [self.request qn_requestRemoveTask];
 }
 
 - (void)didLoadData:(nonnull NSData *)data {

QiniuSDK/Utils/QNVersion.h

@@ -11,4 +11,4 @@
 /**
  *    sdk 版本
  */
-static NSString *const kQiniuVersion = @"7.4.0";
+static NSString *const kQiniuVersion = @"7.4.1";

README.md

@@ -13,7 +13,7 @@
 通过 CocoaPods
 
 ```ruby
-pod "Qiniu", "~> 7.4" 
+pod "Qiniu", "~> 7.4.1" 
 ```
 
 ## 运行环境