Commit graph

1372 commits

Author SHA1 Message Date
Jean-Francois Morin
472ba1c66a Replace NSData by NSUInteger in connection:didReceiveData:
Signed-off-by: Mattt Thompson <m@mattt.me>
2013-04-16 11:00:26 +03:00
Kevin Harwood
3c6bec4207 Added runtime check to disable pinning in the example
Signed-off-by: Mattt Thompson <m@mattt.me>
2013-04-16 10:31:41 +03:00
Mattt Thompson
b3267b85b0 Merge pull request #911 from runmad/master
Check for finished operations, not cancelled operations to increment the numberOfFinishedOperations count
2013-04-11 01:07:10 -07:00
Rune Madsen
8d075dde30 Check for finished operations in order to increments the numberOfFinishedOperations count 2013-04-10 14:47:36 -04:00
Kevin Harwood
22d6747b74 Merge branch 'master' into invalid-ssl 2013-04-09 08:48:56 -05:00
Kevin Harwood
fa9fa6e0d4 Fixed if/else logic 2013-04-09 08:47:26 -05:00
Mattt Thompson
0d49f731a2 Merge pull request #902 from OliverLetterer/master
Some minor stuff
2013-04-09 00:11:41 -07:00
Kevin Harwood
e6807f4176 Merge branch 'master' into invalid-ssl 2013-04-08 09:52:42 -05:00
Oliver Letterer
ae6b3bb368 Now using NSParameterAssert instead of NSCParameterAssert. 2013-04-08 14:04:43 +02:00
Oliver Letterer
ecbe8166cd Now using errSecSuccess instead of noErr for Security frameworks OSStatus. 2013-04-08 14:04:08 +02:00
Mattt Thompson
24dd68fa6e Merge pull request #882 from OliverLetterer/derived-certificates
Pinning certificates will now trust all derived certificates.
2013-04-07 23:50:36 -07:00
Oliver Letterer
f51a762772 Merges master. 2013-04-07 18:26:16 +02:00
Kevin Harwood
e016c731d3 Merged upstream/master back to resolve conflicts 2013-04-07 08:15:07 -05:00
Mattt Thompson
6aec2bab03 Merge pull request #900 from kcharwood/ssl_pin_example
Fix SSL Pinning
2013-04-06 23:34:23 -07:00
Oliver Letterer
8b2d01a503 Fixes SecTrustCreateWithCertificates expecting an array as first argument. 2013-04-07 08:29:29 +02:00
Kevin Harwood
1d1378d9aa Merge remote-tracking branch 'upstream/master' into invalid-ssl
Conflicts:
	AFNetworking/AFURLConnectionOperation.h
2013-04-06 16:31:28 -05:00
Kevin Harwood
158db930ff Revert "Added guard around adding a NULL object to an array"
This reverts commit c8e420990e.
2013-04-06 15:46:50 -05:00
Kevin Harwood
c8e420990e Added guard around adding a NULL object to an array 2013-04-06 15:02:57 -05:00
Mattt Thompson
6d64ea1fa5 [Issue #888] Fixing property attribution build warning in AFHTTPClient body stream provider 2013-04-06 20:17:35 +02:00
Mattt Thompson
48398eb0ac Adding __unused to block paramters 2013-04-06 20:09:23 +02:00
@scutdavy
7207f2f19f Using indexesOfObjectsPassingTest to calculate numberOfFinishedOperations in -enqueueBatchOfHTTPRequestOperations:
Signed-off-by: Mattt Thompson <m@mattt.me>
2013-04-06 20:06:15 +02:00
Kevin Harwood
5b633898b3 Clean up 2013-04-06 11:33:29 -05:00
Kevin Harwood
ebccca44da Fixed SSL Pinning
- SSL Pinning switch case was not being applied if a .cer file was found in the bundle.
- SSL Public Key pinning was broken because we didn't make a call to SecTrustEvaluate before SecTrustCopyPublicKey
2013-04-06 11:30:47 -05:00
Kevin Harwood
06a9c63ead Attempting to add the pinning mode as an example. 2013-04-06 11:04:02 -05:00
Mattt Thompson
25dcdcaf75 Merge branch 'master' of github.com:AFNetworking/AFNetworking 2013-04-06 15:42:36 +02:00
Sebastian Utz
205a8aa7e3 Only encode JSON with UTF8, following recommendation of NSJSONSerialization documentation
Signed-off-by: Mattt Thompson <m@mattt.me>
2013-04-06 15:42:10 +02:00
Mattt Thompson
c943d8a7b5 Merge pull request #879 from OliverLetterer/loops-loops-loops
Refactoring some loops to fast enumeration.
2013-04-06 06:35:07 -07:00
Peter Steinberger
bab6a8b28f Set AFNetworking thread name
Signed-off-by: Mattt Thompson <m@mattt.me>
2013-04-06 12:42:01 +02:00
Mattt Thompson
1e675520f5 Merge branch 'master' of github.com:AFNetworking/AFNetworking 2013-04-06 12:40:41 +02:00
Mattt Thompson
9fba242e48 Merge pull request #890 from noa--/lion_fix
Fix macro to work correctly under 10.7 SDK / iOS 4 SDK
2013-04-06 03:34:16 -07:00
Mattt Thompson
dddd339b46 Merge pull request #893 from mtitolo/master
Removed @discussion tags from docs
2013-04-06 03:30:45 -07:00
James Clarke
ab00b9559c Fixing AFImageRequestOperation to use [self alloc] instead of explicit class in class method in order to preserve behavior in subclasses
Signed-off-by: Mattt Thompson <m@mattt.me>
2013-04-06 12:11:29 +02:00
Michele
bc149aa3c2 Removed all @discussion tags, since they are not supported. 2013-04-02 17:13:30 -07:00
Paul Melnikow
bc7544bb8a Use Apple's recommended style, and fix so it works under 10.7 or pre-5.0 2013-04-02 12:22:53 -07:00
Paul Melnikow
c80bfef9e3 Fix macro to work correctly under 10.7 SDK / iOS 4 SDK 2013-04-02 11:24:38 -07:00
Oliver Letterer
a0f1f83a2b Pinning certificates will now trust all derived certificates. 2013-03-28 08:34:44 +01:00
Oliver Letterer
7745e8f444 Refactoring some loops to fast enumeration. 2013-03-27 15:06:47 +01:00
Kevin Harwood
8e5dac8d42 Documentation update 2013-03-25 17:28:28 -05:00
Kevin Harwood
22f5153bb8 Set the operation flag in HTTPRequestOperationWithRequest 2013-03-25 17:26:28 -05:00
Kevin Harwood
f64ce9143d Added invalidSSL flag to AFHTTPClient 2013-03-25 17:21:56 -05:00
Kevin Harwood
a150b95f09 Updated documentation 2013-03-25 17:18:12 -05:00
Kevin Harwood
48558d7b48 Removed invalid SSL macro from new 1.2.0 code 2013-03-25 17:15:43 -05:00
Kevin Harwood
bcb8aea682 Merge branch 'master' into invalid-ssl 2013-03-25 17:11:42 -05:00
Mattt Thompson
43b05d7ceb Merge pull request #872 from kcharwood/documentation_update
Small correction to SSL Pinning documentation
2013-03-25 15:03:41 -07:00
Kevin Harwood
71157c90a0 Small correction to SSL Pinning documentation 2013-03-24 08:45:36 -05:00
Mattt Thompson
566a40f469 Reformatting CHANGES 2013-03-24 02:29:59 -04:00
Mattt Thompson
7e8422f4d2 Reformatting CHANGES 2013-03-24 02:28:55 -04:00
Mattt Thompson
feb55db859 Bumping version to 1.2.0 2013-03-24 02:22:50 -04:00
Mattt Thompson
90f84c7120 Updating CHANGES to 1.2.0 release 2013-03-24 02:22:28 -04:00
Mattt Thompson
59039d6a83 Re-ordering AFHTTPClient multipart proxy methods 2013-03-24 02:13:37 -04:00