Merge branch 'master' into concurrent
Conflicts: Classes/ASIHTTPRequest.m
Showing
32 changed files
with
33 additions
and
31 deletions
1 | // | 1 | // |
2 | // ASIAuthenticationDialog.h | 2 | // ASIAuthenticationDialog.h |
3 | -// iPhone | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 21/08/2009. | 5 | // Created by Ben Copsey on 21/08/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIAuthenticationDialog.m | 2 | // ASIAuthenticationDialog.m |
3 | -// iPhone | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 21/08/2009. | 5 | // Created by Ben Copsey on 21/08/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIFormDataRequest.h | 2 | // ASIFormDataRequest.h |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 07/11/2008. | 5 | // Created by Ben Copsey on 07/11/2008. |
6 | // Copyright 2008-2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008-2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIFormDataRequest.m | 2 | // ASIFormDataRequest.m |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 07/11/2008. | 5 | // Created by Ben Copsey on 07/11/2008. |
6 | // Copyright 2008-2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008-2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIInputStream.h | 2 | // ASIInputStream.h |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 10/08/2009. | 5 | // Created by Ben Copsey on 10/08/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIInputStream.m | 2 | // ASIInputStream.m |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 10/08/2009. | 5 | // Created by Ben Copsey on 10/08/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASINSStringAdditions.h | 2 | // ASINSStringAdditions.h |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 12/09/2008. | 5 | // Created by Ben Copsey on 12/09/2008. |
6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASINSStringAdditions.m | 2 | // ASINSStringAdditions.m |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 12/09/2008. | 5 | // Created by Ben Copsey on 12/09/2008. |
6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASINetworkQueue.h | 2 | // ASINetworkQueue.h |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 07/11/2008. | 5 | // Created by Ben Copsey on 07/11/2008. |
6 | // Copyright 2008-2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008-2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASINetworkQueue.m | 2 | // ASINetworkQueue.m |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 07/11/2008. | 5 | // Created by Ben Copsey on 07/11/2008. |
6 | // Copyright 2008-2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008-2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIS3BucketObject.h | 2 | // ASIS3BucketObject.h |
3 | -// Mac | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 13/07/2009. | 5 | // Created by Ben Copsey on 13/07/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIS3BucketObject.m | 2 | // ASIS3BucketObject.m |
3 | -// Mac | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 13/07/2009. | 5 | // Created by Ben Copsey on 13/07/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIS3ListRequest.h | 2 | // ASIS3ListRequest.h |
3 | -// Mac | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 13/07/2009. | 5 | // Created by Ben Copsey on 13/07/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIS3ListRequest.m | 2 | // ASIS3ListRequest.m |
3 | -// Mac | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 13/07/2009. | 5 | // Created by Ben Copsey on 13/07/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIS3Request.h | 2 | // ASIS3Request.h |
3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest | ||
3 | // | 4 | // |
4 | // Created by Ben Copsey on 30/06/2009. | 5 | // Created by Ben Copsey on 30/06/2009. |
5 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIS3Request.m | 2 | // ASIS3Request.m |
3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest | ||
3 | // | 4 | // |
4 | // Created by Ben Copsey on 30/06/2009. | 5 | // Created by Ben Copsey on 30/06/2009. |
5 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIFormDataRequestTests.h | 2 | // ASIFormDataRequestTests.h |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 08/11/2008. | 5 | // Created by Ben Copsey on 08/11/2008. |
6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIFormDataRequestTests.m | 2 | // ASIFormDataRequestTests.m |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 08/11/2008. | 5 | // Created by Ben Copsey on 08/11/2008. |
6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIHTTPRequestTests.h | 2 | // ASIHTTPRequestTests.h |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 01/08/2008. | 5 | // Created by Ben Copsey on 01/08/2008. |
6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIHTTPRequestTests.m | 2 | // ASIHTTPRequestTests.m |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 01/08/2008. | 5 | // Created by Ben Copsey on 01/08/2008. |
6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASINetworkQueueTests.h | 2 | // ASINetworkQueueTests.h |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 08/11/2008. | 5 | // Created by Ben Copsey on 08/11/2008. |
6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASINetworkQueueTests.m | 2 | // ASINetworkQueueTests.m |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 08/11/2008. | 5 | // Created by Ben Copsey on 08/11/2008. |
6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2008 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIS3RequestTests.h | 2 | // ASIS3RequestTests.h |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 12/07/2009. | 5 | // Created by Ben Copsey on 12/07/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASIS3RequestTests.m | 2 | // ASIS3RequestTests.m |
3 | -// asi-http-request | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 12/07/2009. | 5 | // Created by Ben Copsey on 12/07/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASITestCase.h | 2 | // ASITestCase.h |
3 | -// iPhone | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 26/07/2009. | 5 | // Created by Ben Copsey on 26/07/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ASITestCase.m | 2 | // ASITestCase.m |
3 | -// iPhone | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 26/07/2009. | 5 | // Created by Ben Copsey on 26/07/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // PerformanceTests.h | 2 | // PerformanceTests.h |
3 | -// Mac | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 17/12/2009. | 5 | // Created by Ben Copsey on 17/12/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
7 | // | 7 | // |
8 | 8 | ||
9 | -#import <Cocoa/Cocoa.h> | 9 | +#import <Foundation/Foundation.h> |
10 | #import "ASITestCase.h" | 10 | #import "ASITestCase.h" |
11 | 11 | ||
12 | @interface PerformanceTests : ASITestCase { | 12 | @interface PerformanceTests : ASITestCase { |
1 | // | 1 | // |
2 | // PerformanceTests.m | 2 | // PerformanceTests.m |
3 | -// Mac | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 17/12/2009. | 5 | // Created by Ben Copsey on 17/12/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ProxyTests.h | 2 | // ProxyTests.h |
3 | -// Mac | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 02/08/2009. | 5 | // Created by Ben Copsey on 02/08/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // ProxyTests.m | 2 | // ProxyTests.m |
3 | -// Mac | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 02/08/2009. | 5 | // Created by Ben Copsey on 02/08/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // StressTests.h | 2 | // StressTests.h |
3 | -// iPhone | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 30/10/2009. | 5 | // Created by Ben Copsey on 30/10/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
1 | // | 1 | // |
2 | // StressTests.m | 2 | // StressTests.m |
3 | -// iPhone | 3 | +// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest |
4 | // | 4 | // |
5 | // Created by Ben Copsey on 30/10/2009. | 5 | // Created by Ben Copsey on 30/10/2009. |
6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. | 6 | // Copyright 2009 All-Seeing Interactive. All rights reserved. |
-
Please register or login to post a comment