Skip to content

Commit

Permalink
6.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
garenwang committed Feb 1, 2024
1 parent 99dfd6b commit 592342d
Show file tree
Hide file tree
Showing 16 changed files with 88 additions and 39 deletions.
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PODS:
- QCloudCOSXML (6.3.4):
- QCloudCOSXML/Default (= 6.3.4)
- QCloudCOSXML/Default (6.3.4):
- QCloudCore (= 6.3.4)
- QCloudCore/Default (= 6.3.4)
- QCloudQuic (6.3.4):
- QCloudQuic/Default (= 6.3.4)
- QCloudQuic/Default (6.3.4)
Expand Down Expand Up @@ -47,9 +47,9 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
GMOpenSSL: d6d119ff8f00d4e03c2cdf733fb61e98e22da9c7
QCloudCore: bac15e68fc43dc3409905f290543fcef4d8eba52
QCloudCOSXML: 886d52f482c7108604b3ffef5476cf28c502af97
QCloudQuic: 840f529d7e8adf058e28405106ccb01fd920548b
QCloudCore: 0fab1d5a90c79be21b10285d2252fa1f8d8d5c1e
QCloudCOSXML: 7bbdb57c28a2d2b65312a16ede903c7c1fc28f99
QCloudQuic: 898b278b4424a5971dd204d8548fc7111c7fc6e4
QCloudTrack: a1e25308ead00d58db596b8564c7f197a8a06102
TencentCloudLogProducer: 980e6a4b9ed49b7b3f41779203be5e4ba1b03b95

Expand Down
8 changes: 4 additions & 4 deletions QCloudCOSXML.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pod::Spec.new do |s|
s.name = "QCloudCOSXML"


s.version = "6.3.4"
s.version = "6.3.5"


s.summary = "QCloudCOSXML 腾讯云iOS-SDK组件"
Expand All @@ -20,15 +20,15 @@ s.version = "6.3.4"
s.default_subspec = 'Default'
s.subspec 'Default' do |default|
default.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
default.dependency "QCloudCore/Default",'6.3.4'
default.dependency "QCloudCore/Default",'6.3.5'
end
s.subspec 'Slim' do |slim|
slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
slim.dependency "QCloudCore/WithoutMTA",'6.3.4'
slim.dependency "QCloudCore/WithoutMTA",'6.3.5'
end
s.subspec 'Transfer' do |transfer|
transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
transfer.dependency "QCloudCore/WithoutMTA",'6.3.4'
transfer.dependency "QCloudCore/WithoutMTA",'6.3.5'

end

Expand Down
2 changes: 1 addition & 1 deletion QCloudCOSXML/Classes/QCloudCOSXMLVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#ifndef QCloudCOSXMLModuleVersion_h
#define QCloudCOSXMLModuleVersion_h
#define QCloudCOSXMLModuleVersionNumber 603004
#define QCloudCOSXMLModuleVersionNumber 603005

//dependency

Expand Down
2 changes: 1 addition & 1 deletion QCloudCOSXML/Classes/QCloudCOSXMLVersion.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "QCloudCOSXMLVersion.h"
NSString * const QCloudCOSXMLModuleVersion = @"6.3.4";
NSString * const QCloudCOSXMLModuleVersion = @"6.3.5";
NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
@interface QCloudQCloudCOSXMLLoad : NSObject
@end
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -279,5 +279,69 @@
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "8DA76074-1419-4B72-B54D-9E08779DCFAD"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "QCloudCOSXMLDemo/QCloudDownLoadNewCtor.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "146"
endingLineNumber = "146"
landmarkName = "-fetchData"
landmarkType = "7">
<Locations>
<Location
uuid = "8DA76074-1419-4B72-B54D-9E08779DCFAD - 1c06dd375cf4c6cb"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__34-[QCloudDownLoadNewCtor fetchData]_block_invoke.115"
moduleName = "QCloudCOSXMLDemo"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/garenwang/Documents/code/qcloud-sdk-ios/QCloudCOSXMLDemo/QCloudDownLoadNewCtor.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "146"
endingLineNumber = "146"
offsetFromSymbolStart = "90">
</Location>
<Location
uuid = "8DA76074-1419-4B72-B54D-9E08779DCFAD - d91332317d7af37c"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__34-[QCloudDownLoadNewCtor fetchData]_block_invoke_2.116"
moduleName = "QCloudCOSXMLDemo"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/garenwang/Documents/code/qcloud-sdk-ios/QCloudCOSXMLDemo/QCloudDownLoadNewCtor.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "147"
endingLineNumber = "147"
offsetFromSymbolStart = "23">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BBB935FA-D6B5-420F-A9C2-2F154E28F03E"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "QCloudCOSXMLDemo/QCloudDownLoadNewCtor.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "128"
endingLineNumber = "128"
landmarkName = "-fetchData"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
2 changes: 1 addition & 1 deletion QCloudCore.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Pod::Spec.new do |s|
s.name = "QCloudCore"


s.version = "6.3.4"
s.version = "6.3.5"



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,24 +236,7 @@ - (NSURLSessionResponseDisposition)reciveResponse:(NSURLResponse *)response {

-(BOOL)needChangeHost{
NSString * host = self.urlRequest.URL.host;
if(!host){
return NO;
}
if([host rangeOfString:@".cos.accelerate.myqcloud.com"].length > 0){
return NO;
}

if([host rangeOfString:@"service.cos.myqcloud.com"].length > 0){
return NO;
}
if([host rangeOfString:@".myqcloud.com"].length > 0 && [host rangeOfString:@"cos."].length > 0 && [host rangeOfString:@".cos."].length == 0){
return NO;
}

if([host rangeOfString:@".myqcloud.com"].length > 0 && [host rangeOfString:@".cos."].length > 0){
return YES;
}
return NO;
return [QCloudHTTPRequest needChangeHost:host];
}

+(BOOL)needChangeHost:(NSString *)host{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ - (void)URLSession:(NSURLSession *)session

- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest * _Nullable))completionHandler{
QCloudURLSessionTaskData *taskData = [self taskDataForTask:task];
if(taskData.httpRequest.runOnService.configuration.disableChangeHost == YES || [response.allHeaderFields.allKeys containsObject:@"x-cos-request-id"] || [request.URL.absoluteURL.host rangeOfString:@"tencentcos.cn"].length > 0){
if(![taskData.httpRequest needChangeHost] || taskData.httpRequest.runOnService.configuration.disableChangeHost == YES || [response.allHeaderFields.allKeys containsObject:@"x-cos-request-id"] || [request.URL.absoluteURL.host rangeOfString:@"tencentcos.cn"].length > 0){
completionHandler(request);
}else{
completionHandler(nil);
Expand Down Expand Up @@ -324,7 +324,9 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
return;
}

if(taskData.response.statusCode > 400 && [hostURL.host rangeOfString:@"tencentcos.cn"].length == 0 && ![taskData.response.allHeaderFields.allKeys containsObject:@"x-cos-request-id"] && taskData.httpRequest.runOnService.configuration.disableChangeHost == NO){
if(taskData.response.statusCode > 400 && [hostURL.host rangeOfString:@"tencentcos.cn"].length == 0 && ![taskData.response.allHeaderFields.allKeys containsObject:@"x-cos-request-id"] &&
[taskData.httpRequest needChangeHost] &&
taskData.httpRequest.runOnService.configuration.disableChangeHost == NO){
error = [NSError errorWithDomain:hostURL.host code:QCloudNetworkErrorCodeDomainInvalid userInfo:@{NSLocalizedDescriptionKey: @""}];
taskData.isTaskCancelledByStatusCodeCheck = NO;
}
Expand Down
2 changes: 1 addition & 1 deletion QCloudCore/Classes/Base/QCloudCoreVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#ifndef QCloudCoreModuleVersion_h
#define QCloudCoreModuleVersion_h
#define QCloudCoreModuleVersionNumber 603004
#define QCloudCoreModuleVersionNumber 603005

//dependency

Expand Down
2 changes: 1 addition & 1 deletion QCloudCore/Classes/Base/QCloudCoreVersion.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "QCloudCoreVersion.h"
NSString * const QCloudCoreModuleVersion = @"6.3.4";
NSString * const QCloudCoreModuleVersion = @"6.3.5";
NSString * const QCloudCoreModuleName = @"QCloudCore";
@interface QCloudQCloudCoreLoad : NSObject
@end
Expand Down
2 changes: 1 addition & 1 deletion QCloudQuic.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Pod::Spec.new do |s|
s.name = "QCloudQuic"


s.version = "6.3.4"
s.version = "6.3.5"


s.summary = "QCloudQuic 腾讯云iOS-SDK组件"
Expand Down
4 changes: 2 additions & 2 deletions QCloudQuic/Classes/QCloudQuicVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

#ifndef QCloudQuicModuleVersion_h
#define QCloudQuicModuleVersion_h
#define QCloudQuicModuleVersionNumber 603003
#define QCloudQuicModuleVersionNumber 603005

//dependency

//
FOUNDATION_EXTERN NSString * const QCloudQuicModuleVersion;
FOUNDATION_EXTERN NSString * const QCloudQuicModuleName;

#endif
#endif
2 changes: 1 addition & 1 deletion QCloudQuic/Classes/QCloudQuicVersion.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "QCloudQuicVersion.h"
NSString * const QCloudQuicModuleVersion = @"6.3.3";
NSString * const QCloudQuicModuleVersion = @"6.3.5";
NSString * const QCloudQuicModuleName = @"QCloudQuic";
@interface QCloudQCloudQuicLoad : NSObject
@end
Expand Down
2 changes: 1 addition & 1 deletion QCloudTrack/Classes/QCloudTrackVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#ifndef QCloudTrackModuleVersion_h
#define QCloudTrackModuleVersion_h
#define QCloudTrackModuleVersionNumber 603004
#define QCloudTrackModuleVersionNumber 603005

//dependency

Expand Down
2 changes: 1 addition & 1 deletion QCloudTrack/Classes/QCloudTrackVersion.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "QCloudTrackVersion.h"
NSString * const QCloudTrackModuleVersion = @"6.3.4";
NSString * const QCloudTrackModuleVersion = @"6.3.5";
NSString * const QCloudTrackModuleName = @"QCloudTrack";
@interface QCloudQCloudTrackLoad : NSObject
@end
Expand Down

0 comments on commit 592342d

Please sign in to comment.