Merge pull request #174 from longbai/ipv6

longbai · longbai · commit b9fd1e32496a · 2016-05-31T11:50:50.000+07:00
ipv6 support for ios8
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,16 @@
 language: objective-c
-before_install: true
-  #- brew update
-  #- brew upgrade xctool
-  #- gem install cocoapods
+before_install:
+  - rvm install 2.3.1
+  - rvm use 2.3.1
+  - brew update
+  - brew outdated xctool || brew upgrade xctool
+  - gem install cocoapods --pre
+  - pod --version
+  - pod repo remove master
+  - pod setup
+  - pod install --verbose --no-repo-update
 before_script:
   - export QINIU_TEST_ENV="travis"
 script:
-  - xctool -workspace QiniuSDK.xcworkspace -scheme "QiniuSDK iOS" -sdk iphonesimulator -configuration Release test -test-sdk iphonesimulator7.0 -freshInstall -freshSimulator
-  - xctool -workspace QiniuSDK.xcworkspace -scheme "QiniuSDK Mac" -sdk macosx -configuration Release test -test-sdk macosx
+  - xctool -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_iOS -sdk iphonesimulator -configuration Release test -test-sdk iphonesimulator7.0 -freshInstall -freshSimulator
+  - xctool -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_Mac -sdk macosx -configuration Release test -test-sdk macosx
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 #Changelog
 
+## 7.0.20 (2016-05-30)
+
+### 修正
+* iOS8 ipv6 问题
+* 为ipv6兼容，happydns 指定为 0.3以上
+
 ## 7.0.19 (2016-05-23)
 
 ### 修正
diff --git a/Podfile b/Podfile
@@ -1,23 +1,32 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
-target "QiniuSDK iOS" do
+def shared_dependencies
+  pod "AFNetworking", "~> 2.5.0"
+  pod "HappyDNS", ">= 0.3"
+end
+
+def test_dependencies
+  pod "AGAsyncTestHelper/Shorthand"
+end
+
+target "QiniuSDK_iOS" do
   platform :ios, "6.0"
-  pod 'AFNetworking', '~> 2.5.0'
-  pod 'HappyDNS', '>= 0.2'
+  shared_dependencies
 end
 
-target "QiniuSDK iOSTests" do
+target "QiniuSDK_iOSTests" do
   platform :ios, "6.0"
-  pod 'AGAsyncTestHelper/Shorthand'
+  shared_dependencies
+  test_dependencies
 end
 
-target "QiniuSDK Mac" do
+target "QiniuSDK_Mac" do
   platform :osx, "10.8"
-  pod 'AFNetworking', '~> 2.5.0'
-  pod 'HappyDNS', '>= 0.2'
+  shared_dependencies
 end
 
-target "QiniuSDK MacTests" do
+target "QiniuSDK_MacTests" do
   platform :osx, "10.8"
-  pod 'AGAsyncTestHelper/Shorthand'
+  shared_dependencies
+  test_dependencies
 end
diff --git a/Qiniu.podspec b/Qiniu.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = "7.0.19.1"
+  s.version      = "7.0.20"
   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"
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.libraries = "z"
   s.dependency "AFNetworking", "~> 2.0"
-  s.dependency "HappyDNS", "~> 0.2"
+  s.dependency "HappyDNS", "~> 0.3"
   s.license = { :type => "MIT", :text => <<-LICENSE
 The MIT License (MIT)
 
diff --git a/QiniuSDK.xcodeproj/project.pbxproj b/QiniuSDK.xcodeproj/project.pbxproj
diff --git a/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_Mac.xcscheme b/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,57 +15,60 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DF2CDDFE19DAC05500CE01FB"
-               BuildableName = "libQiniuSDK Mac.dylib"
-               BlueprintName = "QiniuSDK Mac"
+               BuildableName = "QiniuSDK_Mac.dylib"
+               BlueprintName = "QiniuSDK_Mac"
                ReferencedContainer = "container:QiniuSDK.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DF2CDE0919DAC05500CE01FB"
-               BuildableName = "QiniuSDK MacTests.xctest"
-               BlueprintName = "QiniuSDK MacTests"
+               BuildableName = "QiniuSDK_MacTests.xctest"
+               BlueprintName = "QiniuSDK_MacTests"
                ReferencedContainer = "container:QiniuSDK.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DF2CDDFE19DAC05500CE01FB"
-            BuildableName = "libQiniuSDK Mac.dylib"
-            BlueprintName = "QiniuSDK Mac"
+            BuildableName = "QiniuSDK_Mac.dylib"
+            BlueprintName = "QiniuSDK_Mac"
             ReferencedContainer = "container:QiniuSDK.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
diff --git a/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_iOS.xcscheme b/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,26 +15,26 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DF2CDE1919DAC08400CE01FB"
-               BuildableName = "libQiniuSDK iOS.a"
-               BlueprintName = "QiniuSDK iOS"
+               BuildableName = "libQiniuSDK_iOS.a"
+               BlueprintName = "QiniuSDK_iOS"
                ReferencedContainer = "container:QiniuSDK.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DF2CDE2319DAC08400CE01FB"
-               BuildableName = "QiniuSDK iOSTests.xctest"
-               BlueprintName = "QiniuSDK iOSTests"
+               BuildableName = "QiniuSDK_iOSTests.xctest"
+               BlueprintName = "QiniuSDK_iOSTests"
                ReferencedContainer = "container:QiniuSDK.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -43,45 +43,48 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DF2CDE1919DAC08400CE01FB"
-            BuildableName = "libQiniuSDK iOS.a"
-            BlueprintName = "QiniuSDK iOS"
+            BuildableName = "libQiniuSDK_iOS.a"
+            BlueprintName = "QiniuSDK_iOS"
             ReferencedContainer = "container:QiniuSDK.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DF2CDE1919DAC08400CE01FB"
-            BuildableName = "libQiniuSDK iOS.a"
-            BlueprintName = "QiniuSDK iOS"
+            BuildableName = "libQiniuSDK_iOS.a"
+            BlueprintName = "QiniuSDK_iOS"
             ReferencedContainer = "container:QiniuSDK.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DF2CDE1919DAC08400CE01FB"
-            BuildableName = "libQiniuSDK iOS.a"
-            BlueprintName = "QiniuSDK iOS"
+            BuildableName = "libQiniuSDK_iOS.a"
+            BlueprintName = "QiniuSDK_iOS"
             ReferencedContainer = "container:QiniuSDK.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
diff --git a/QiniuSDK/Common/QNSystem.h b/QiniuSDK/Common/QNSystem.h
@@ -15,7 +15,6 @@ BOOL hasAts();
 
 BOOL allowsArbitraryLoads();
 
-//iOS8判断
-BOOL isIOS8();
+BOOL isIpV6FullySupported();
 
 #endif /* QNSystem_h */
diff --git a/QiniuSDK/Common/QNSystem.m b/QiniuSDK/Common/QNSystem.m
@@ -23,8 +23,10 @@ BOOL hasNSURLSession() {
     }
 #else
     NSOperatingSystemVersion sysVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
-    if ((sysVersion.majorVersion <= 10 && sysVersion.minorVersion < 9)) {
+    if (sysVersion.majorVersion < 10) {
         return NO;
+    } else if (sysVersion.majorVersion == 10) {
+        return sysVersion.minorVersion >= 9;
     }
 #endif
     return YES;
@@ -38,9 +40,10 @@ BOOL hasAts() {
     }
 #else
     NSOperatingSystemVersion sysVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
-
-    if ((sysVersion.majorVersion <= 10 && sysVersion.minorVersion < 11)) {
+    if (sysVersion.majorVersion < 10) {
         return NO;
+    } else if (sysVersion.majorVersion == 10) {
+        return sysVersion.minorVersion >= 11;
     }
 #endif
     return YES;
@@ -68,12 +71,19 @@ BOOL allowsArbitraryLoads() {
     return ats.boolValue;
 }
 
-BOOL isIOS8() {
+BOOL isIpV6FullySupported() {
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
     float sysVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
-    if ((sysVersion >= 8.0) && sysVersion < 9.0) {
-        return YES;
+    if (sysVersion < 9.0) {
+        return NO;
+    }
+#else
+    NSOperatingSystemVersion sysVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
+    if (sysVersion.majorVersion < 10) {
+        return NO;
+    } else if (sysVersion.majorVersion == 10) {
+        return sysVersion.minorVersion >= 11;
     }
 #endif
-    return NO;
-}
+    return YES;
+}
diff --git a/QiniuSDK/Http/QNHttpManager.m b/QiniuSDK/Http/QNHttpManager.m
@@ -12,6 +12,7 @@
 #import "QNConfiguration.h"
 #import "QNHttpManager.h"
 #import "QNResponseInfo.h"
+#include "QNSystem.h"
 #import "QNUserAgent.h"
 
 @interface QNHttpManager ()
@@ -176,7 +177,7 @@ - (void)sendRequest:(NSMutableURLRequest *)request
         url = [[NSURL alloc] initWithString:_converter(u)];
         request.URL = url;
         domain = url.host;
-    } else if (_dns != nil && [url.scheme isEqual:@"http"]) {
+    } else if (_dns != nil && [url.scheme isEqual:@"http"] && !(isIpV6FullySupported() && [QNIP isV6])) {
         ips = [_dns queryWithDomain:[[QNDomain alloc] init:domain hostsFirst:NO hasCname:YES maxTtl:1000]];
         double duration = [[NSDate date] timeIntervalSinceDate:startTime];
         if (ips == nil || ips.count == 0) {
diff --git a/QiniuSDK/Http/QNSessionManager.m b/QiniuSDK/Http/QNSessionManager.m
@@ -13,7 +13,7 @@
 #import "QNConfiguration.h"
 #import "QNResponseInfo.h"
 #import "QNSessionManager.h"
-#import "QNSystem.h"
+#include "QNSystem.h"
 #import "QNUserAgent.h"
 
 #if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
@@ -163,7 +163,7 @@ - (void)sendRequest:(NSMutableURLRequest *)request
         url = [[NSURL alloc] initWithString:_converter(u)];
         request.URL = url;
         domain = url.host;
-    } else if (_noProxy && _dns != nil && [url.scheme isEqualToString:@"http"]) {
+    } else if (_noProxy && _dns != nil && [url.scheme isEqualToString:@"http"] && !(isIpV6FullySupported() && [QNIP isV6])) {
         ips = [_dns queryWithDomain:[[QNDomain alloc] init:domain hostsFirst:NO hasCname:YES maxTtl:1000]];
         double duration = [[NSDate date] timeIntervalSinceDate:startTime];
 
diff --git a/QiniuSDK/Storage/QNConfiguration.m b/QiniuSDK/Storage/QNConfiguration.m
@@ -100,7 +100,7 @@ - (instancetype)init {
         _proxy = nil;
         _converter = nil;
 
-        if (hasAts() && !allowsArbitraryLoads() && isIOS8()) {
+        if (hasAts() && !allowsArbitraryLoads()) {
             _disableATS = NO;
         } else {
             _disableATS = YES;
diff --git a/QiniuSDKTests/QNFormUploadTest.m b/QiniuSDKTests/QNFormUploadTest.m
diff --git a/README.md b/README.md
