update url authenticate

.gitignore

@@ -10,4 +10,7 @@ profile
 *.pbxuser
 *.mode1v3
 External/GHUnit/*
-.svn
+.svn
+Products
+xcuserdata/
+project.xcworkspace/

ASIKit-iOS/ASIKit-iOS-Info.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.sina.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>CFPlugInDynamicRegisterFunction</key>
+	<string></string>
+	<key>CFPlugInDynamicRegistration</key>
+	<string>NO</string>
+	<key>CFPlugInFactories</key>
+	<dict>
+		<key>00000000-0000-0000-0000-000000000000</key>
+		<string>MyFactoryFunction</string>
+	</dict>
+	<key>CFPlugInTypes</key>
+	<dict>
+		<key>00000000-0000-0000-0000-000000000000</key>
+		<array>
+			<string>00000000-0000-0000-0000-000000000000</string>
+		</array>
+	</dict>
+	<key>CFPlugInUnloadFunction</key>
+	<string></string>
+	<key></key>
+	<string></string>
+</dict>
+</plist>

ASIKit-iOS/ASIKit-iOS-Prefix.pch

@@ -0,0 +1,9 @@
+//
+//  Prefix header
+//
+//  The contents of this file are implicitly included at the beginning of every source file.
+//
+//
+//#ifdef __OBJC__
+//    #import <Cocoa/Cocoa.h>
+//#endif

ASIKit-iOS/ASIKit.h

@@ -0,0 +1,38 @@
+//
+//  ASIKit.h
+//  iPhone
+//
+//  Created by Littlebox222 on 14-5-22.
+//
+//
+
+
+#import <ASIKit/Reachability.h>
+#import <ASIKit/ASIAuthenticationDialog.h>
+#import <ASIKit/ASIHTTPRequestConfig.h>
+#import <ASIKit/ASICacheDelegate.h>
+#import <ASIKit/ASIHTTPRequestDelegate.h>
+#import <ASIKit/ASIProgressDelegate.h>
+#import <ASIKit/ASIInputStream.h>
+#import <ASIKit/ASIFormDataRequest.h>
+#import <ASIKit/ASIHTTPRequest.h>
+#import <ASIKit/ASINetworkQueue.h>
+#import <ASIKit/ASIDownloadCache.h>
+#import <ASIKit/ASIDataDecompressor.h>
+#import <ASIKit/ASIDataCompressor.h>
+#import <ASIKit/ASIWebPageRequest.h>
+
+#import <ASIKit/ASIS3Bucket.h>
+#import <ASIKit/ASIS3BucketObject.h>
+#import <ASIKit/ASIS3BucketRequest.h>
+#import <ASIKit/ASIS3ObjectRequest.h>
+#import <ASIKit/ASIS3ServiceRequest.h>
+#import <ASIKit/ASIS3Request.h>
+
+#import <ASIKit/ASICloudFilesCDNRequest.h>
+#import <ASIKit/ASICloudFilesContainer.h>
+#import <ASIKit/ASICloudFilesContainerRequest.h>
+#import <ASIKit/ASICloudFilesContainerXMLParserDelegate.h>
+#import <ASIKit/ASICloudFilesObject.h>
+#import <ASIKit/ASICloudFilesObjectRequest.h>
+#import <ASIKit/ASICloudFilesRequest.h>

ASIKit-iOS/en.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

ASIKit/ASIKit-Info.plist

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.sina.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

ASIKit/ASIKit-Prefix.pch

@@ -0,0 +1,9 @@
+//
+//  Prefix header
+//
+//  The contents of this file are implicitly included at the beginning of every source file.
+//
+
+#ifdef __OBJC__
+    #import <Cocoa/Cocoa.h>
+#endif

ASIKit/ASIKit.h

@@ -0,0 +1,33 @@
+//
+//  ASIKit.h
+//  ASIKit
+//
+//  Created by Bruce on 14-5-12.
+//
+//
+#import <ASIKit/ASIHTTPRequest.h>
+#import <ASIKit/ASIProgressDelegate.h>
+#import <ASIKit/ASIHTTPRequestDelegate.h>
+#import <ASIKit/ASIInputStream.h>
+#import <ASIKit/ASIFormDataRequest.h>
+#import <ASIKit/ASIHTTPRequest.h>
+#import <ASIKit/ASINetworkQueue.h>
+#import <ASIKit/ASICacheDelegate.h>
+#import <ASIKit/ASIDownloadCache.h>
+#import <ASIKit/ASIDataCompressor.h>
+#import <ASIKit/ASIDataDecompressor.h>
+#import <ASIKit/ASIWebPageRequest.h>
+#import <ASIKit/ASINSXMLParserCompat.h>
+#import <ASIKit/ASICloudFilesCDNRequest.h>
+#import <ASIKit/ASICloudFilesContainer.h>
+#import <ASIKit/ASICloudFilesContainerRequest.h>
+#import <ASIKit/ASICloudFilesContainerXMLParserDelegate.h>
+#import <ASIKit/ASICloudFilesObject.h>
+#import <ASIKit/ASICloudFilesObjectRequest.h>
+#import <ASIKit/ASICloudFilesRequest.h>
+#import <ASIKit/ASIS3Bucket.h>
+#import <ASIKit/ASIS3BucketObject.h>
+#import <ASIKit/ASIS3BucketRequest.h>
+#import <ASIKit/ASIS3ObjectRequest.h>
+#import <ASIKit/ASIS3ServiceRequest.h>
+#import <ASIKit/ASIS3Request.h>

ASIKit/en.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Build Scripts/fetch_ios_ghunit.rb

@@ -9,6 +9,6 @@
 
 require 'net/http'
 if (!File.exists?('External/GHUnit/GHUnitIOS.framework'))
-	`curl -s http://allseeing-i.com/ASIHTTPRequest/GHUnit/GHUnit-IOS.zip > External/GHUnit/GHUnit-IOS.zip`
+	`curl -s http://sinastorage.com/sdk/GHUnit/GHUnitIOS-0.5.8.zip > External/GHUnit/GHUnit-IOS.zip`
   	`unzip External/GHUnit/GHUnit-IOS.zip -d External/GHUnit/ & rm External/GHUnit/GHUnit-IOS.zip`
 end

Build Scripts/fetch_mac_ghunit.rb

@@ -9,6 +9,6 @@
 
 require 'net/http'
 if (!File.exists?('External/GHUnit/GHUnit.framework'))
-	`curl -s http://allseeing-i.com/ASIHTTPRequest/GHUnit/GHUnit-Mac.zip > External/GHUnit/GHUnit-Mac.zip`
+	`curl -s http://sinastorage.com/sdk/GHUnit/GHUnitOSX-0.5.8.zip > External/GHUnit/GHUnit-Mac.zip`
   	`unzip External/GHUnit/GHUnit-Mac.zip -d External/GHUnit/ & rm External/GHUnit/GHUnit-Mac.zip`
 end

Classes/ASIDataCompressor.h

@@ -11,19 +11,17 @@
 // Most of the zlib stuff is based on the sample code by Mark Adler available at http://zlib.net
 
 #import <Foundation/Foundation.h>
-#import <zlib.h>
 
 @interface ASIDataCompressor : NSObject {
 	BOOL streamReady;
-	z_stream zStream;
 }
 
 // Convenience constructor will call setupStream for you
 + (id)compressor;
 
 // Compress the passed chunk of data
 // Passing YES for shouldFinish will finalize the deflated data - you must pass YES when you are on the last chunk of data
-- (NSData *)compressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err shouldFinish:(BOOL)shouldFinish;
+- (NSData *)compressBytes:(Byte *)bytes length:(NSUInteger)length error:(NSError **)err shouldFinish:(BOOL)shouldFinish;
 
 // Convenience method - pass it some data, and you'll get deflated data back
 + (NSData *)compressData:(NSData*)uncompressedData error:(NSError **)err;

Classes/ASIDataCompressor.m

@@ -8,11 +8,14 @@
 
 #import "ASIDataCompressor.h"
 #import "ASIHTTPRequest.h"
+#import <zlib.h>
 
 #define DATA_CHUNK_SIZE 262144 // Deal with gzipped data in 256KB chunks
 #define COMPRESSION_AMOUNT Z_DEFAULT_COMPRESSION
 
-@interface ASIDataCompressor ()
+@interface ASIDataCompressor () {
+    z_stream zStream;
+}
 + (NSError *)deflateErrorWithCode:(int)code;
 @end
 
@@ -66,7 +69,7 @@ - (NSError *)closeStream
 	return nil;
 }
 
-- (NSData *)compressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err shouldFinish:(BOOL)shouldFinish
+- (NSData *)compressBytes:(Byte *)bytes length:(NSUInteger)length error:(NSError **)err shouldFinish:(BOOL)shouldFinish
 {
 	if (length == 0) return nil;
 

Classes/ASIDataDecompressor.h

@@ -11,18 +11,16 @@
 // Most of the zlib stuff is based on the sample code by Mark Adler available at http://zlib.net
 
 #import <Foundation/Foundation.h>
-#import <zlib.h>
 
 @interface ASIDataDecompressor : NSObject {
 	BOOL streamReady;
-	z_stream zStream;
 }
 
 // Convenience constructor will call setupStream for you
 + (id)decompressor;
 
 // Uncompress the passed chunk of data
-- (NSData *)uncompressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err;
+- (NSData *)uncompressBytes:(Byte *)bytes length:(NSUInteger)length error:(NSError **)err;
 
 // Convenience method - pass it some deflated data, and you'll get inflated data back
 + (NSData *)uncompressData:(NSData*)compressedData error:(NSError **)err;

Classes/ASIDataDecompressor.m

@@ -8,10 +8,13 @@
 
 #import "ASIDataDecompressor.h"
 #import "ASIHTTPRequest.h"
+#import <zlib.h>
 
 #define DATA_CHUNK_SIZE 262144 // Deal with gzipped data in 256KB chunks
 
-@interface ASIDataDecompressor ()
+@interface ASIDataDecompressor () {
+    z_stream zStream;
+}
 + (NSError *)inflateErrorWithCode:(int)code;
 @end;
 
@@ -65,7 +68,7 @@ - (NSError *)closeStream
 	return nil;
 }
 
-- (NSData *)uncompressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err
+- (NSData *)uncompressBytes:(Byte *)bytes length:(NSUInteger)length error:(NSError **)err
 {
 	if (length == 0) return nil;
 

Classes/ASIHTTPRequest.h

@@ -881,6 +881,7 @@ typedef void (^ASIDataBlock)(NSData *data);
 // Returns a date from a string in RFC1123 format
 + (NSDate *)dateFromRFC1123String:(NSString *)string;
 
++ (NSString*)encodeURL:(NSString *)string;
 
 // Used for detecting multitasking support at runtime (for backgrounding requests)
 #if TARGET_OS_IPHONE

Classes/ASIHTTPRequest.m

@@ -24,7 +24,7 @@
 #import "ASIDataCompressor.h"
 
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.8.1-61 2011-09-19";
+NSString *ASIHTTPRequestVersion = @"v1.8.2-15 2014-05-20";
 
 static NSString *defaultUserAgent = nil;
 
@@ -4560,7 +4560,7 @@ + (void)recordBandwidthUsage
 		}
 	}
 	#if DEBUG_THROTTLING
-	ASI_DEBUG_LOG(@"[THROTTLING] ===Used: %u bytes of bandwidth in last measurement period===",bandwidthUsedInLastSecond);
+	ASI_DEBUG_LOG(@"[THROTTLING] ===Used: %lu bytes of bandwidth in last measurement period===",bandwidthUsedInLastSecond);
 	#endif
 	[bandwidthUsageTracker addObject:[NSNumber numberWithUnsignedLong:bandwidthUsedInLastSecond]];
 	[bandwidthMeasurementDate release];
@@ -4622,7 +4622,7 @@ + (unsigned long)maxUploadReadLength
 
 	// We'll split our bandwidth allowance into 4 (which is the default for an ASINetworkQueue's max concurrent operations count) to give all running requests a fighting chance of reading data this cycle
 	long long toRead = maxBandwidthPerSecond/4;
-	if (maxBandwidthPerSecond > 0 && (bandwidthUsedInLastSecond + toRead > maxBandwidthPerSecond)) {
+	if (maxBandwidthPerSecond > 0 && (bandwidthUsedInLastSecond + (unsigned long long)toRead > maxBandwidthPerSecond)) {
 		toRead = (long long)maxBandwidthPerSecond-(long long)bandwidthUsedInLastSecond;
 		if (toRead < 0) {
 			toRead = 0;
@@ -4935,6 +4935,15 @@ + (void)parseMimeType:(NSString **)mimeType andResponseEncoding:(NSStringEncodin
 	}
 }
 
++ (NSString*)encodeURL:(NSString *)string
+{
+    NSString *newString = [NSMakeCollectable(CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (CFStringRef)string, NULL, CFSTR(":/?#[]@!$ &'()*+,;=\"<>%{}|\\^~`"), CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding))) autorelease];
+    if (newString) {
+        return newString;
+    }
+    return @"";
+}
+
 #pragma mark -
 #pragma mark blocks
 #if NS_BLOCKS_AVAILABLE

Classes/CloudFiles/ASICloudFilesCDNRequest.m

@@ -81,15 +81,15 @@ + (id)listRequestWithLimit:(NSUInteger)limit marker:(NSString *)marker enabledOn
 	NSString *query = @"?format=xml";
 
 	if (limit > 0) {
-		query = [query stringByAppendingString:[NSString stringWithFormat:@"&limit=%i", limit]];
+		query = [query stringByAppendingString:[NSString stringWithFormat:@"&limit=%lu", (unsigned long)limit]];
 	}
 
 	if (marker) {
 		query = [query stringByAppendingString:[NSString stringWithFormat:@"&marker=%@", marker]];
 	}
 
 	if (limit > 0) {
-		query = [query stringByAppendingString:[NSString stringWithFormat:@"&limit=%i", limit]];
+		query = [query stringByAppendingString:[NSString stringWithFormat:@"&limit=%lu", (unsigned long)limit]];
 	}
 
 	ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest cdnRequestWithMethod:@"GET" query:query];
@@ -128,7 +128,7 @@ + (id)putRequestWithContainer:(NSString *)containerName {
 
 + (id)putRequestWithContainer:(NSString *)containerName ttl:(NSUInteger)ttl {
 	ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest cdnRequestWithMethod:@"PUT" containerName:containerName];	
-	[request addRequestHeader:@"X-Ttl" value:[NSString stringWithFormat:@"%i", ttl]];
+	[request addRequestHeader:@"X-Ttl" value:[NSString stringWithFormat:@"%lu", (unsigned long)ttl]];
 	return request;
 }
 
@@ -148,7 +148,7 @@ + (id)postRequestWithContainer:(NSString *)containerName {
 + (id)postRequestWithContainer:(NSString *)containerName cdnEnabled:(BOOL)cdnEnabled ttl:(NSUInteger)ttl {
 	ASICloudFilesCDNRequest *request = [ASICloudFilesCDNRequest cdnRequestWithMethod:@"POST" containerName:containerName];
 	if (ttl > 0) {
-		[request addRequestHeader:@"X-Ttl" value:[NSString stringWithFormat:@"%i", ttl]];
+		[request addRequestHeader:@"X-Ttl" value:[NSString stringWithFormat:@"%lu", (unsigned long)ttl]];
 	}
 	[request addRequestHeader:@"X-CDN-Enabled" value:cdnEnabled ? @"True" : @"False"];
 	return request;

Classes/CloudFiles/ASICloudFilesContainerRequest.m

@@ -64,7 +64,7 @@ + (id)listRequestWithLimit:(NSUInteger)limit marker:(NSString *)marker {
 	NSString *queryString = @"?format=xml";
 
 	if (limit > 0) {
-		queryString = [queryString stringByAppendingString:[NSString stringWithFormat:@"&limit=%i", limit]];
+		queryString = [queryString stringByAppendingString:[NSString stringWithFormat:@"&limit=%lu", (unsigned long)limit]];
 	}
 
 	if (marker != nil) {