Граф коммитов

1392 Коммитов

Автор SHA1 Сообщение Дата
michael_r_may 1e27caa977 Switched the #warning messages to #pragma message messages instead, so you can still compile the framework with -Werror switched on 2013-05-05 22:18:53 +01:00
joein3d 370c4754c1 don't escape tildes as per http://tools.ietf.org/html/rfc3986#section-2.3 2013-05-05 10:49:34 -07:00
Mattt Thompson e54ffdc33e Merge branch 'master' of github.com:AFNetworking/AFNetworking 2013-05-05 09:42:48 -07:00
Mattt Thompson 9629ff97c3 Minor edits to documentation 2013-05-05 09:42:39 -07:00
Mattt Thompson f959d81760 Merge pull request #966 from OliverLetterer/use-error
Using self.error instead of self.JSONError in AFJSONRequestOperation.
2013-05-02 16:20:19 -07:00
Mattt Thompson 8f80919375 Merge pull request #935 from OliverLetterer/cfstream-race-condition
Workaround for #907.
2013-05-02 16:17:48 -07:00
Oliver Letterer 1ce0a211ba Using self.error instead of self.JSONError in AFJSONRequestOperation. 2013-05-02 20:03:17 +02:00
Mattt Thompson 613ef3489d Merge pull request #960 from audun/master
Fixed a few minor compilation errors when using ObjC++
2013-04-30 10:54:20 -07:00
Audun Holm Ellertsen 05184b2769 Adds explicit type casts where necessary for ObjC++ compilation 2013-04-29 12:19:45 +01:00
Yaron Inger 00901df325 Add __unused to stream delegate parameter 2013-04-28 16:25:50 +03:00
Henrik Hartz cbfe5b72c6 Suppressed GNU expression and Enum assignment warnings from clang 2013-04-28 11:19:09 +02:00
Dave Keck fff8704a44 Fixing crasher in AFNetworkActivityIndicatorManager, due to unsafe calls to updateNetworkActivityIndicatorVisibilityDelayed from multiple threads. 2013-04-23 11:10:34 -10:00
Dave Anderson a0cc020357 A GET request for file:///path/to/file URLs has a self.response that does not respond to allHeaderFields because it is an NSURLResponse not an NSHTTPURLResponse 2013-04-22 16:23:28 -06:00
Oliver Letterer 6a6862c43b Workaround for #907. 2013-04-21 18:07:46 +02:00
Mattt Thompson 215a32e23c Bumping version to 1.2.1
Updating CHANGES for 1.2.1
2013-04-18 07:47:53 +02:00
Mattt Thompson c28434ce71 Fixing error in documentation about defaultSSLPinningMode
Minor copy editing in documentation
2013-04-17 18:42:34 +02:00
Mattt Thompson b838dd85c1 Minor reformatting 2013-04-17 18:39:50 +02:00
Mattt Thompson 9cbc749d40 Renaming allowInvalidSSLCertificate -> allowsInvalidSSLCertificate 2013-04-17 18:38:44 +02:00
Mattt Thompson 174bc47c84 Minor refactoring / renaming / copy edits 2013-04-17 18:28:08 +02:00
Mattt Thompson 8ea42866b8 Merge branch 'invalid-ssl' of git://github.com/kcharwood/AFNetworking into kcharwood-invalid-ssl 2013-04-17 18:04:50 +02:00
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