From fcb4e684c09023e1cf877e342d25834d7fae37e8 Mon Sep 17 00:00:00 2001 From: RedBug Date: Fri, 3 Feb 2017 19:16:49 +0100 Subject: [PATCH 1/7] Update ASIHTTPRequest.m --- Classes/ASIHTTPRequest.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Classes/ASIHTTPRequest.m b/Classes/ASIHTTPRequest.m index cb6bbeea..40787285 100644 --- a/Classes/ASIHTTPRequest.m +++ b/Classes/ASIHTTPRequest.m @@ -2540,8 +2540,9 @@ - (NSMutableDictionary *)findCredentials NSMutableDictionary *newCredentials = [[[NSMutableDictionary alloc] init] autorelease]; // First, let's look at the url to see if the username and password were included - NSString *user = [[self url] user]; - NSString *pass = [[self url] password]; + NSURLComponents *components = [NSURLComponents componentsWithURL:self.url resolvingAgainstBaseURL:NO]; + NSString *user = components.user; + NSString *pass = components.password; if (user && pass) { From 8f047976a1d8d7729fc49054c0c6b5af241acb25 Mon Sep 17 00:00:00 2001 From: RedBug Date: Fri, 3 Feb 2017 19:25:44 +0100 Subject: [PATCH 2/7] Create ASIHTTPRequest.podspec --- ASIHTTPRequest.podspec | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 ASIHTTPRequest.podspec diff --git a/ASIHTTPRequest.podspec b/ASIHTTPRequest.podspec new file mode 100644 index 00000000..c41c59d2 --- /dev/null +++ b/ASIHTTPRequest.podspec @@ -0,0 +1,76 @@ +{ + "name": "ASIHTTPRequest", + "version": "1.8.2", + "summary": "Easy to use CFNetwork wrapper for HTTP requests, Objective-C, Mac OS X and iPhone.", + "homepage": "http://allseeing-i.com/ASIHTTPRequest", + "authors": { + "Ben Copsey": "ben@allseeing-i.com" + }, + "license": "New BSD License", + "source": { + "git": "https://github.com/pokeb/asi-http-request.git", + "tag": "v1.8.2" + }, + "description": "\n ASIHTTPRequest is an easy to use wrapper around the CFNetwork API that\n makes some of the more tedious aspects of communicating with web servers\n easier. It is written in Objective-C and works in both Mac OS X and iPhone\n applications.\n\n It is suitable performing basic HTTP requests and interacting with\n REST-based services (GET / POST / PUT / DELETE). The included\n ASIFormDataRequest subclass makes it easy to submit POST data and files\n using multipart/form-data.\n\n Please note that ASIHTTPRequest is not recommended for newer projects \n since it's not actively maintained anymore. \n For more info visit: http://allseeing-i.com/%5Brequest_release%5D\n ", + "requires_arc": false, + "subspecs": [ + { + "name": "Core", + "source_files": "Classes/*.{h,m}", + "ios": { + "dependencies": { + "Reachability": [ + + ] + }, + "frameworks": [ + "MobileCoreServices", + "CFNetwork", + "CoreGraphics" + ] + }, + "osx": { + "exclude_files": "**/*ASIAuthenticationDialog*", + "frameworks": [ + "SystemConfiguration", + "CoreServices" + ] + }, + "libraries": "z.1" + }, + { + "name": "ASIWebPageRequest", + "source_files": "Classes/ASIWebPageRequest/*.{h,m}", + "libraries": "xml2.2", + "xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(SDKROOT)/usr/include/libxml2\"" + }, + "dependencies": { + "ASIHTTPRequest/Core": [ + + ] + } + }, + { + "name": "CloudFiles", + "source_files": [ + "Classes/CloudFiles/*.{h,m}", + "Classes/S3/ASINSXMLParserCompat.h" + ], + "dependencies": { + "ASIHTTPRequest/Core": [ + + ] + } + }, + { + "name": "S3", + "source_files": "Classes/S3/*.{h,m}", + "dependencies": { + "ASIHTTPRequest/Core": [ + + ] + } + } + ] +} From 482fbc2c36cff18aa66d17631c13bdaf67bfd703 Mon Sep 17 00:00:00 2001 From: RedBug Date: Fri, 3 Feb 2017 19:27:16 +0100 Subject: [PATCH 3/7] Update ASIHTTPRequest.podspec --- ASIHTTPRequest.podspec | 97 +++++++++++------------------------------- 1 file changed, 25 insertions(+), 72 deletions(-) diff --git a/ASIHTTPRequest.podspec b/ASIHTTPRequest.podspec index c41c59d2..c009bc8e 100644 --- a/ASIHTTPRequest.podspec +++ b/ASIHTTPRequest.podspec @@ -1,76 +1,29 @@ -{ - "name": "ASIHTTPRequest", - "version": "1.8.2", - "summary": "Easy to use CFNetwork wrapper for HTTP requests, Objective-C, Mac OS X and iPhone.", - "homepage": "http://allseeing-i.com/ASIHTTPRequest", - "authors": { - "Ben Copsey": "ben@allseeing-i.com" - }, - "license": "New BSD License", - "source": { - "git": "https://github.com/pokeb/asi-http-request.git", - "tag": "v1.8.2" - }, - "description": "\n ASIHTTPRequest is an easy to use wrapper around the CFNetwork API that\n makes some of the more tedious aspects of communicating with web servers\n easier. It is written in Objective-C and works in both Mac OS X and iPhone\n applications.\n\n It is suitable performing basic HTTP requests and interacting with\n REST-based services (GET / POST / PUT / DELETE). The included\n ASIFormDataRequest subclass makes it easy to submit POST data and files\n using multipart/form-data.\n\n Please note that ASIHTTPRequest is not recommended for newer projects \n since it's not actively maintained anymore. \n For more info visit: http://allseeing-i.com/%5Brequest_release%5D\n ", - "requires_arc": false, - "subspecs": [ - { - "name": "Core", - "source_files": "Classes/*.{h,m}", - "ios": { - "dependencies": { - "Reachability": [ +Pod::Spec.new do |s| + s.name = 'ASIHTTPRequest' + s.version = '1.8.zipmark' + s.summary = 'Easy to use CFNetwork wrapper for HTTP requests, Objective-C, Mac OS X and iPhone' + s.homepage = 'http://allseeing-i.com/ASIHTTPRequest' + s.author = { 'Ben Copsey' => 'ben@allseeing-i.com' } + s.source = { :git => 'https://github.com/pokeb/asi-http-request.git', :commit => '4282568eec0b487a98e312ce49b523350ffa4a6b' } - ] - }, - "frameworks": [ - "MobileCoreServices", - "CFNetwork", - "CoreGraphics" - ] - }, - "osx": { - "exclude_files": "**/*ASIAuthenticationDialog*", - "frameworks": [ - "SystemConfiguration", - "CoreServices" - ] - }, - "libraries": "z.1" - }, - { - "name": "ASIWebPageRequest", - "source_files": "Classes/ASIWebPageRequest/*.{h,m}", - "libraries": "xml2.2", - "xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(SDKROOT)/usr/include/libxml2\"" - }, - "dependencies": { - "ASIHTTPRequest/Core": [ + s.description = %{ + ASIHTTPRequest is an easy to use wrapper around the CFNetwork API that + makes some of the more tedious aspects of communicating with web servers + easier. It is written in Objective-C and works in both Mac OS X and iPhone + applications. + It is suitable performing basic HTTP requests and interacting with + REST-based services (GET / POST / PUT / DELETE). The included + ASIFormDataRequest subclass makes it easy to submit POST data and files + using multipart/form-data. + } - ] - } - }, - { - "name": "CloudFiles", - "source_files": [ - "Classes/CloudFiles/*.{h,m}", - "Classes/S3/ASINSXMLParserCompat.h" - ], - "dependencies": { - "ASIHTTPRequest/Core": [ + s.source_files = 'Classes' - ] - } - }, - { - "name": "S3", - "source_files": "Classes/S3/*.{h,m}", - "dependencies": { - "ASIHTTPRequest/Core": [ + # TODO actually I think one or some of these are for Reachability + s.xcconfig = { 'OTHER_LDFLAGS' => '-framework SystemConfiguration ' \ + '-framework CFNetwork ' \ + '-framework MobileCoreServices ' \ + '-l z.1' } - ] - } - } - ] -} + s.dependency 'Reachability', '~> 2.0', '>= 2.0.4' +end From 58b1e1d6b57492e9795f584738418189b8768a56 Mon Sep 17 00:00:00 2001 From: RedBug Date: Fri, 3 Feb 2017 19:28:33 +0100 Subject: [PATCH 4/7] Update ASIHTTPRequest.podspec --- ASIHTTPRequest.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ASIHTTPRequest.podspec b/ASIHTTPRequest.podspec index c009bc8e..d48899f1 100644 --- a/ASIHTTPRequest.podspec +++ b/ASIHTTPRequest.podspec @@ -1,10 +1,10 @@ Pod::Spec.new do |s| s.name = 'ASIHTTPRequest' - s.version = '1.8.zipmark' + s.version = '1.8.2' s.summary = 'Easy to use CFNetwork wrapper for HTTP requests, Objective-C, Mac OS X and iPhone' s.homepage = 'http://allseeing-i.com/ASIHTTPRequest' s.author = { 'Ben Copsey' => 'ben@allseeing-i.com' } - s.source = { :git => 'https://github.com/pokeb/asi-http-request.git', :commit => '4282568eec0b487a98e312ce49b523350ffa4a6b' } + s.source = { :git => 'https://github.com/redbug26/asi-http-request.git' } s.description = %{ ASIHTTPRequest is an easy to use wrapper around the CFNetwork API that From 4f8df3d22a69376dd5132dbfbca636894a6cd78e Mon Sep 17 00:00:00 2001 From: RedBug Date: Fri, 3 Feb 2017 19:30:04 +0100 Subject: [PATCH 5/7] Update ASIHTTPRequest.podspec --- ASIHTTPRequest.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ASIHTTPRequest.podspec b/ASIHTTPRequest.podspec index d48899f1..2adc99e0 100644 --- a/ASIHTTPRequest.podspec +++ b/ASIHTTPRequest.podspec @@ -25,5 +25,5 @@ Pod::Spec.new do |s| '-framework MobileCoreServices ' \ '-l z.1' } - s.dependency 'Reachability', '~> 2.0', '>= 2.0.4' + s.dependency 'Reachability' end From 187b4884b9c99fe4f853084077b412c5f8485b43 Mon Sep 17 00:00:00 2001 From: RedBug Date: Fri, 3 Feb 2017 19:32:57 +0100 Subject: [PATCH 6/7] Create ASIHTTPRequest.podspec.json --- ASIHTTPRequest.podspec.json | 76 +++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 ASIHTTPRequest.podspec.json diff --git a/ASIHTTPRequest.podspec.json b/ASIHTTPRequest.podspec.json new file mode 100644 index 00000000..c41c59d2 --- /dev/null +++ b/ASIHTTPRequest.podspec.json @@ -0,0 +1,76 @@ +{ + "name": "ASIHTTPRequest", + "version": "1.8.2", + "summary": "Easy to use CFNetwork wrapper for HTTP requests, Objective-C, Mac OS X and iPhone.", + "homepage": "http://allseeing-i.com/ASIHTTPRequest", + "authors": { + "Ben Copsey": "ben@allseeing-i.com" + }, + "license": "New BSD License", + "source": { + "git": "https://github.com/pokeb/asi-http-request.git", + "tag": "v1.8.2" + }, + "description": "\n ASIHTTPRequest is an easy to use wrapper around the CFNetwork API that\n makes some of the more tedious aspects of communicating with web servers\n easier. It is written in Objective-C and works in both Mac OS X and iPhone\n applications.\n\n It is suitable performing basic HTTP requests and interacting with\n REST-based services (GET / POST / PUT / DELETE). The included\n ASIFormDataRequest subclass makes it easy to submit POST data and files\n using multipart/form-data.\n\n Please note that ASIHTTPRequest is not recommended for newer projects \n since it's not actively maintained anymore. \n For more info visit: http://allseeing-i.com/%5Brequest_release%5D\n ", + "requires_arc": false, + "subspecs": [ + { + "name": "Core", + "source_files": "Classes/*.{h,m}", + "ios": { + "dependencies": { + "Reachability": [ + + ] + }, + "frameworks": [ + "MobileCoreServices", + "CFNetwork", + "CoreGraphics" + ] + }, + "osx": { + "exclude_files": "**/*ASIAuthenticationDialog*", + "frameworks": [ + "SystemConfiguration", + "CoreServices" + ] + }, + "libraries": "z.1" + }, + { + "name": "ASIWebPageRequest", + "source_files": "Classes/ASIWebPageRequest/*.{h,m}", + "libraries": "xml2.2", + "xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(SDKROOT)/usr/include/libxml2\"" + }, + "dependencies": { + "ASIHTTPRequest/Core": [ + + ] + } + }, + { + "name": "CloudFiles", + "source_files": [ + "Classes/CloudFiles/*.{h,m}", + "Classes/S3/ASINSXMLParserCompat.h" + ], + "dependencies": { + "ASIHTTPRequest/Core": [ + + ] + } + }, + { + "name": "S3", + "source_files": "Classes/S3/*.{h,m}", + "dependencies": { + "ASIHTTPRequest/Core": [ + + ] + } + } + ] +} From 0790c6c2935cbddb53e3622b60d9c3bbe47f5937 Mon Sep 17 00:00:00 2001 From: RedBug Date: Fri, 3 Feb 2017 19:33:13 +0100 Subject: [PATCH 7/7] Delete ASIHTTPRequest.podspec --- ASIHTTPRequest.podspec | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 ASIHTTPRequest.podspec diff --git a/ASIHTTPRequest.podspec b/ASIHTTPRequest.podspec deleted file mode 100644 index 2adc99e0..00000000 --- a/ASIHTTPRequest.podspec +++ /dev/null @@ -1,29 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'ASIHTTPRequest' - s.version = '1.8.2' - s.summary = 'Easy to use CFNetwork wrapper for HTTP requests, Objective-C, Mac OS X and iPhone' - s.homepage = 'http://allseeing-i.com/ASIHTTPRequest' - s.author = { 'Ben Copsey' => 'ben@allseeing-i.com' } - s.source = { :git => 'https://github.com/redbug26/asi-http-request.git' } - - s.description = %{ - ASIHTTPRequest is an easy to use wrapper around the CFNetwork API that - makes some of the more tedious aspects of communicating with web servers - easier. It is written in Objective-C and works in both Mac OS X and iPhone - applications. - It is suitable performing basic HTTP requests and interacting with - REST-based services (GET / POST / PUT / DELETE). The included - ASIFormDataRequest subclass makes it easy to submit POST data and files - using multipart/form-data. - } - - s.source_files = 'Classes' - - # TODO actually I think one or some of these are for Reachability - s.xcconfig = { 'OTHER_LDFLAGS' => '-framework SystemConfiguration ' \ - '-framework CFNetwork ' \ - '-framework MobileCoreServices ' \ - '-l z.1' } - - s.dependency 'Reachability' -end