iOS / asi-http-request

Go to a project
Toggle navigation Toggle navigation pinning
Ben Copsey
5ed451b4 1 parent 4535486c

Tweaks to ensure proxyType is correctly reused in HEAD requests and copies, and released in dealloc

Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 24
25 // Automatically set on build 25 // Automatically set on build
26 26
27 -NSString *ASIHTTPRequestVersion = @"v1.7-5 2010-06-30"; 27 +NSString *ASIHTTPRequestVersion = @"v1.7-6 2010-06-30";
28 28
29 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain"; 29 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
30 30
@@ -327,6 +327,7 @@ static NSOperationQueue *sharedQueue = nil; @@ -327,6 +327,7 @@ static NSOperationQueue *sharedQueue = nil;
327 [authenticationScheme release]; 327 [authenticationScheme release];
328 [requestCredentials release]; 328 [requestCredentials release];
329 [proxyHost release]; 329 [proxyHost release];
  330 + [proxyType release];
330 [proxyUsername release]; 331 [proxyUsername release];
331 [proxyPassword release]; 332 [proxyPassword release];
332 [proxyDomain release]; 333 [proxyDomain release];
@@ -1313,6 +1314,7 @@ static NSOperationQueue *sharedQueue = nil; @@ -1313,6 +1314,7 @@ static NSOperationQueue *sharedQueue = nil;
1313 [headRequest setProxyDomain:[self proxyDomain]]; 1314 [headRequest setProxyDomain:[self proxyDomain]];
1314 [headRequest setProxyHost:[self proxyHost]]; 1315 [headRequest setProxyHost:[self proxyHost]];
1315 [headRequest setProxyPort:[self proxyPort]]; 1316 [headRequest setProxyPort:[self proxyPort]];
  1317 + [headRequest setProxyType:[self proxyType]];
1316 [headRequest setShouldPresentAuthenticationDialog:[self shouldPresentAuthenticationDialog]]; 1318 [headRequest setShouldPresentAuthenticationDialog:[self shouldPresentAuthenticationDialog]];
1317 [headRequest setShouldPresentProxyAuthenticationDialog:[self shouldPresentProxyAuthenticationDialog]]; 1319 [headRequest setShouldPresentProxyAuthenticationDialog:[self shouldPresentProxyAuthenticationDialog]];
1318 [headRequest setTimeOutSeconds:[self timeOutSeconds]]; 1320 [headRequest setTimeOutSeconds:[self timeOutSeconds]];
@@ -2955,6 +2957,7 @@ static NSOperationQueue *sharedQueue = nil; @@ -2955,6 +2957,7 @@ static NSOperationQueue *sharedQueue = nil;
2955 [newRequest setProxyDomain:[self proxyDomain]]; 2957 [newRequest setProxyDomain:[self proxyDomain]];
2956 [newRequest setProxyHost:[self proxyHost]]; 2958 [newRequest setProxyHost:[self proxyHost]];
2957 [newRequest setProxyPort:[self proxyPort]]; 2959 [newRequest setProxyPort:[self proxyPort]];
  2960 + [newRequest setProxyType:[self proxyType]];
2958 [newRequest setUploadProgressDelegate:[self uploadProgressDelegate]]; 2961 [newRequest setUploadProgressDelegate:[self uploadProgressDelegate]];
2959 [newRequest setDownloadProgressDelegate:[self downloadProgressDelegate]]; 2962 [newRequest setDownloadProgressDelegate:[self downloadProgressDelegate]];
2960 [newRequest setShouldPresentAuthenticationDialog:[self shouldPresentAuthenticationDialog]]; 2963 [newRequest setShouldPresentAuthenticationDialog:[self shouldPresentAuthenticationDialog]];