Ben Copsey

Merge branch 'master' of https://github.com/mindsnacks/asi-http-request into mindsnacks-master

Conflicts:
	Classes/ASIHTTPRequest.m
@@ -207,7 +207,7 @@ @@ -207,7 +207,7 @@
207 [super buildPostBody]; 207 [super buildPostBody];
208 208
209 #if DEBUG_FORM_DATA_REQUEST 209 #if DEBUG_FORM_DATA_REQUEST
210 - NSLog(@"%@",[self debugBodyString]); 210 + ASI_DEBUG_LOG(@"%@",[self debugBodyString]);
211 [self setDebugBodyString:nil]; 211 [self setDebugBodyString:nil];
212 #endif 212 #endif
213 } 213 }
This diff is collapsed. Click to expand it.
@@ -11,6 +11,12 @@ @@ -11,6 +11,12 @@
11 // Debug output configuration options 11 // Debug output configuration options
12 // ====== 12 // ======
13 13
  14 +// If defined will use the specified function for debug logging
  15 +// Otherwise use NSLog
  16 +#ifndef ASI_DEBUG_LOG
  17 + #define ASI_DEBUG_LOG NSLog
  18 +#endif
  19 +
14 // When set to 1 ASIHTTPRequests will print information about what a request is doing 20 // When set to 1 ASIHTTPRequests will print information about what a request is doing
15 #ifndef DEBUG_REQUEST_STATUS 21 #ifndef DEBUG_REQUEST_STATUS
16 #define DEBUG_REQUEST_STATUS 0 22 #define DEBUG_REQUEST_STATUS 0
@@ -33,5 +39,5 @@ @@ -33,5 +39,5 @@
33 39
34 // When set to 1, ASIHTTPRequests will print information about HTTP authentication (Basic, Digest or NTLM) to the console 40 // When set to 1, ASIHTTPRequests will print information about HTTP authentication (Basic, Digest or NTLM) to the console
35 #ifndef DEBUG_HTTP_AUTHENTICATION 41 #ifndef DEBUG_HTTP_AUTHENTICATION
36 -#define DEBUG_HTTP_AUTHENTICATION 0 42 + #define DEBUG_HTTP_AUTHENTICATION 0
37 #endif 43 #endif