Merge pull request #43 from longbai/upport

upport

Author: longbai

QiniuSDK/Http/QNHttpManager.m

@@ -21,6 +21,12 @@ @interface QNHttpManager ()
 @property (nonatomic) NSString *backupIp;
 @end
 
+static NSURL *buildUrl(NSString *host, NSNumber *port, NSString *path){
+    port = port == nil? [NSNumber numberWithInt:80]:port;
+    NSString *p = [[NSString alloc] initWithFormat:@"http://%@:%@%@", host, port, path];
+    return [[NSURL alloc] initWithString:p];
+}
+
 @implementation QNHttpManager
 
 - (instancetype)initWithTimeout:(UInt32)timeout
@@ -74,8 +80,7 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 	__block NSString *ip = nil;
 	if (_converter != nil) {
 		url = [[NSURL alloc] initWithString:_converter(u)];
-	}
-	else {
+	} else {
 		if (_backupIp != nil && ![_backupIp isEqualToString:@""]) {
 			NSString *host = url.host;
 			ip = [QNDns getAddress:host];
@@ -86,7 +91,7 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 			if (path == nil || [@"" isEqualToString:path]) {
 				path = @"/";
 			}
-			url = [[NSURL alloc] initWithScheme:url.scheme host:ip path:path];
+            url = buildUrl(ip, url.port, path);
 			[request setValue:host forHTTPHeaderField:@"Host"];
 		}
 	}

QiniuSDK/Http/QNSessionManager.m

@@ -24,6 +24,13 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 - (instancetype)initWithProgress:(QNInternalProgressBlock)progressBlock;
 @end
 
+static NSURL *buildUrl(NSString *host, NSNumber *port, NSString *path){
+    port = port == nil? [NSNumber numberWithInt:80]:port;
+    NSString *p = [[NSString alloc] initWithFormat:@"http://%@:%@%@", host, port, path];
+    return [[NSURL alloc] initWithString:p];
+}
+
+
 @implementation QNProgessDelegate
 - (instancetype)initWithProgress:(QNInternalProgressBlock)progressBlock {
 	if (self = [super init]) {
@@ -142,6 +149,7 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 				path = @"/";
 			}
 			url = [[NSURL alloc] initWithScheme:url.scheme host:ip path:path];
+            url = buildUrl(ip, url.port, path);
 			NSLog(@"%@", url);
 			[request setValue:host forHTTPHeaderField:@"Host"];
 		}

QiniuSDK/Storage/QNConfiguration.h

@@ -51,6 +51,11 @@ typedef void (^QNConfigurationBuilderBlock)(QNConfigurationBuilder *builder);
  */
 @property (copy, nonatomic, readonly) NSString *upIp;
 
+/**
+ *    上传端口
+ */
+@property (nonatomic, readonly) UInt32 upPort;
+
 /**
  *    断点上传时的分片大小
  */
@@ -137,6 +142,10 @@ typedef void (^QNConfigurationBuilderBlock)(QNConfigurationBuilder *builder);
  */
 @property (nonatomic, strong) QNZone *zone;
 
+/**
+ *    上传端口
+ */
+@property (nonatomic, readonly) UInt32 upPort;
 
 /**
  *    断点上传时的分片大小

QiniuSDK/Storage/QNConfiguration.m

@@ -23,6 +23,8 @@ - (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
 		_upHost = builder.zone.upHost;
 		_upHostBackup = builder.zone.upHostBackup;
 
+		_upPort = builder.upPort;
+
 		_chunkSize = builder.chunkSize;
 		_putThreshold = builder.putThreshold;
 		_retryMax = builder.retryMax;
@@ -58,6 +60,8 @@ - (instancetype)init {
 
 		_proxy = nil;
 		_converter = nil;
+
+		_upPort = 80;
 	}
 	return self;
 }

QiniuSDK/Storage/QNFormUpload.m

@@ -98,7 +98,7 @@ - (void)put {
 			_complete(info, _key, resp);
 		};
 
-		[_httpManager multipartPost:[NSString stringWithFormat:@"http://%@", nextHost]
+		[_httpManager multipartPost:[NSString stringWithFormat:@"http://%@:%u/", nextHost, (unsigned int)_config.upPort]
 		                   withData:_data
 		                 withParams:parameters
 		               withFileName:fileName
@@ -108,7 +108,7 @@ - (void)put {
 		            withCancelBlock:nil];
 	};
 
-	[_httpManager multipartPost:[NSString stringWithFormat:@"http://%@", _config.upHost]
+	[_httpManager multipartPost:[NSString stringWithFormat:@"http://%@:%u/", _config.upHost, (unsigned int)_config.upPort]
 	                   withData:_data
 	                 withParams:parameters
 	               withFileName:fileName

QiniuSDK/Storage/QNResumeUpload.m

@@ -260,7 +260,7 @@ - (void)makeBlock:(NSString *)uphost
          progress:(QNInternalProgressBlock)progressBlock
          complete:(QNCompleteBlock)complete {
 	NSData *data = [self.data subdataWithRange:NSMakeRange(offset, (unsigned int)chunkSize)];
-	NSString *url = [[NSString alloc] initWithFormat:@"http://%@/mkblk/%u", uphost, (unsigned int)blockSize];
+	NSString *url = [[NSString alloc] initWithFormat:@"http://%@:%u/mkblk/%u", uphost, (unsigned int)_config.upPort, (unsigned int)blockSize];
 	_chunkCrc = [QNCrc32 data:data];
 	[self post:url withData:data withCompleteBlock:complete withProgressBlock:progressBlock];
 }
@@ -273,7 +273,7 @@ - (void)putChunk:(NSString *)uphost
         complete:(QNCompleteBlock)complete {
 	NSData *data = [self.data subdataWithRange:NSMakeRange(offset, (unsigned int)size)];
 	UInt32 chunkOffset = offset % kQNBlockSize;
-	NSString *url = [[NSString alloc] initWithFormat:@"http://%@/bput/%@/%u", uphost, context, (unsigned int)chunkOffset];
+	NSString *url = [[NSString alloc] initWithFormat:@"http://%@:%u/bput/%@/%u", uphost, (unsigned int)_config.upPort, context, (unsigned int)chunkOffset];
 	_chunkCrc = [QNCrc32 data:data];
 	[self post:url withData:data withCompleteBlock:complete withProgressBlock:progressBlock];
 }
@@ -286,7 +286,7 @@ - (void)makeFile:(NSString *)uphost
         complete:(QNCompleteBlock)complete {
 	NSString *mime = [[NSString alloc] initWithFormat:@"/mimeType/%@", [QNUrlSafeBase64 encodeString:self.option.mimeType]];
 
-	__block NSString *url = [[NSString alloc] initWithFormat:@"http://%@/mkfile/%u%@", uphost, (unsigned int)self.size, mime];
+	__block NSString *url = [[NSString alloc] initWithFormat:@"http://%@:%u/mkfile/%u%@", uphost, (unsigned int)_config.upPort, (unsigned int)self.size, mime];
 
 	if (self.key != nil) {
 		NSString *keyStr = [[NSString alloc] initWithFormat:@"/key/%@", [QNUrlSafeBase64 encodeString:self.key]];

QiniuSDKTests/QNHttpTest.m

@@ -113,4 +113,16 @@ - (void)testPostIp {
 	XCTAssert(testInfo.reqId, @"Pass");
 }
 
+- (void)testPostNoPort {
+	__block QNResponseInfo *testInfo = nil;
+	QNHttpManager *httpManager = [[QNHttpManager alloc] initWithTimeout:60 urlConverter:nil backupIp:nil];
+	[httpManager post:@"http://up.qiniu.com:12345/" withData:nil withParams:nil withHeaders:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
+	    testInfo = info;
+	} withProgressBlock:nil withCancelBlock:nil];
+
+	AGWW_WAIT_WHILE(testInfo == nil, 100.0);
+	NSLog(@"%@", testInfo);
+	XCTAssert(testInfo.statusCode < 0, @"Pass");
+}
+
 @end

QiniuSDKTests/QNSessionTest.m

@@ -135,6 +135,18 @@ - (void)testPostIp {
 	XCTAssert(testInfo.reqId, @"Pass");
 }
 
+- (void)testPostNoPort {
+	__block QNResponseInfo *testInfo = nil;
+	QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:60 urlConverter:nil backupIp:nil];
+	[httpManager post:@"http://up.qiniu.com:12345/" withData:nil withParams:nil withHeaders:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
+	    testInfo = info;
+	} withProgressBlock:nil withCancelBlock:nil];
+
+	AGWW_WAIT_WHILE(testInfo == nil, 100.0);
+	NSLog(@"%@", testInfo);
+	XCTAssert(testInfo.statusCode < 0, @"Pass");
+}
+
 @end
 
 #endif