Migrating from unsigned int to NSUInteger for better 64-bit support.

HTTPAsyncFileResponse.m

@@ -55,7 +55,7 @@ - (id)initWithFilePath:(NSString *)fpath forConnection:(HTTPConnection *)parent
 			return nil;
 		}
 
-		NSDictionary *fileAttributes = [[NSFileManager defaultManager] fileAttributesAtPath:filePath traverseLink:NO];
+		NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil];
 		NSNumber *fileSize = [fileAttributes objectForKey:NSFileSize];
 		fileLength = (UInt64)[fileSize unsignedLongLongValue];
 
@@ -102,7 +102,7 @@ - (void)setOffset:(UInt64)offset
 	// It will request data, and won't move forward from that point until it has received the data.
 }
 
-- (NSData *)readDataOfLength:(unsigned int)length
+- (NSData *)readDataOfLength:(NSUInteger)length
 {
 	if(data == nil)
 	{
@@ -111,7 +111,7 @@ - (NSData *)readDataOfLength:(unsigned int)length
 			NSInvocationOperation *operation;
 			operation = [[NSInvocationOperation alloc] initWithTarget:self
 															 selector:@selector(readDataInBackground:)
-															   object:[NSNumber numberWithUnsignedInt:length]];
+															   object:[NSNumber numberWithUnsignedInteger:length]];
 
 			[operationQueue addOperation:operation];
 			[operation release];
@@ -153,7 +153,7 @@ - (void)connectionDidClose
 
 - (void)readDataInBackground:(NSNumber *)lengthNumber
 {
-	unsigned int length = [lengthNumber unsignedIntValue];
+	NSUInteger length = [lengthNumber unsignedIntegerValue];
 
 	NSData *readData = [fileHandle readDataOfLength:length];
 

HTTPAuthenticationRequest.m

@@ -146,8 +146,8 @@ - (NSString *)quotedSubHeaderFieldValue:(NSString *)param fromHeaderFieldValue:(
 		return nil;
 	}
 
-	int postStartRangeLocation = startRange.location + startRange.length;
-	int postStartRangeLength = [header length] - postStartRangeLocation;
+	NSUInteger postStartRangeLocation = startRange.location + startRange.length;
+	NSUInteger postStartRangeLength = [header length] - postStartRangeLocation;
 	NSRange postStartRange = NSMakeRange(postStartRangeLocation, postStartRangeLength);
 
 	NSRange endRange = [header rangeOfString:@"\"" options:0 range:postStartRange];
@@ -178,8 +178,8 @@ - (NSString *)nonquotedSubHeaderFieldValue:(NSString *)param fromHeaderFieldValu
 		return nil;
 	}
 
-	int postStartRangeLocation = startRange.location + startRange.length;
-	int postStartRangeLength = [header length] - postStartRangeLocation;
+	NSUInteger postStartRangeLocation = startRange.location + startRange.length;
+	NSUInteger postStartRangeLength = [header length] - postStartRangeLocation;
 	NSRange postStartRange = NSMakeRange(postStartRangeLocation, postStartRangeLength);
 
 	NSRange endRange = [header rangeOfString:@"," options:0 range:postStartRange];

HTTPConnection.m

@@ -63,7 +63,7 @@
 @interface HTTPConnection (PrivateAPI)
 - (CFHTTPMessageRef)newUniRangeResponse:(UInt64)contentLength;
 - (CFHTTPMessageRef)newMultiRangeResponse:(UInt64)contentLength;
-- (NSData *)chunkedTransferSizeLineForLength:(uint)length;
+- (NSData *)chunkedTransferSizeLineForLength:(NSUInteger)length;
 - (NSData *)chunkedTransferFooter;
 @end
 
@@ -848,7 +848,7 @@ - (void)replyToHTTPRequest
 
 			if([data length] > 0)
 			{
-				[responseDataSizes addObject:[NSNumber numberWithUnsignedInt:[data length]]];
+				[responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]];
 
 				if(isChunked)
 				{
@@ -886,13 +886,13 @@ - (void)replyToHTTPRequest
 
 				[httpResponse setOffset:range.location];
 
-				uint bytesToRead = range.length < READ_CHUNKSIZE ? (uint)range.length : READ_CHUNKSIZE;
+				NSUInteger bytesToRead = range.length < READ_CHUNKSIZE ? (NSUInteger)range.length : READ_CHUNKSIZE;
 
 				NSData *data = [httpResponse readDataOfLength:bytesToRead];
 
 				if([data length] > 0)
 				{
-					[responseDataSizes addObject:[NSNumber numberWithUnsignedInt:[data length]]];
+					[responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]];
 
 					long tag = [data length] == range.length ? HTTP_RESPONSE : HTTP_PARTIAL_RANGE_RESPONSE_BODY;
 					[asyncSocket writeData:data withTimeout:WRITE_BODY_TIMEOUT tag:tag];
@@ -912,13 +912,13 @@ - (void)replyToHTTPRequest
 
 				[httpResponse setOffset:range.location];
 
-				uint bytesToRead = range.length < READ_CHUNKSIZE ? (uint)range.length : READ_CHUNKSIZE;
+				NSUInteger bytesToRead = range.length < READ_CHUNKSIZE ? (NSUInteger)range.length : READ_CHUNKSIZE;
 
 				NSData *data = [httpResponse readDataOfLength:bytesToRead];
 
 				if([data length] > 0)
 				{
-					[responseDataSizes addObject:[NSNumber numberWithUnsignedInt:[data length]]];
+					[responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]];
 
 					[asyncSocket writeData:data withTimeout:WRITE_BODY_TIMEOUT tag:HTTP_PARTIAL_RANGES_RESPONSE_BODY];
 				}
@@ -991,7 +991,7 @@ - (CFHTTPMessageRef)newMultiRangeResponse:(UInt64)contentLength
 
 	UInt64 actualContentLength = 0;
 
-	uint i;
+	NSUInteger i;
 	for(i = 0; i < [ranges count]; i++)
 	{
 		DDRange range = [[ranges objectAtIndex:i] ddrangeValue];
@@ -1026,9 +1026,9 @@ - (CFHTTPMessageRef)newMultiRangeResponse:(UInt64)contentLength
  * Returns the chunk size line that must precede each chunk of data when using chunked transfer encoding.
  * This consists of the size of the data, in hexadecimal, followed by a CRLF.
 **/
-- (NSData *)chunkedTransferSizeLineForLength:(uint)length
+- (NSData *)chunkedTransferSizeLineForLength:(NSUInteger)length
 {
-	return [[NSString stringWithFormat:@"%x\r\n", length] dataUsingEncoding:NSUTF8StringEncoding];
+	return [[NSString stringWithFormat:@"%lx\r\n", (unsigned long)length] dataUsingEncoding:NSUTF8StringEncoding];
 }
 
 /**
@@ -1051,14 +1051,14 @@ - (NSData *)chunkedTransferFooter
  * We keep track of this information in order to keep our memory footprint low while
  * working with asynchronous HTTPResponse objects.
 **/
-- (uint)writeQueueSize
+- (NSUInteger)writeQueueSize
 {
-	uint result = 0;
+	NSUInteger result = 0;
 
-	uint i;
+	NSUInteger i;
 	for(i = 0; i < [responseDataSizes count]; i++)
 	{
-		result += [[responseDataSizes objectAtIndex:i] unsignedIntValue];
+		result += [[responseDataSizes objectAtIndex:i] unsignedIntegerValue];
 	}
 
 	return result;
@@ -1086,16 +1086,16 @@ - (void)continueSendingStandardResponseBody
 	// This provides an easy way for the HTTPResponse object to throttle its data allocation in step with the rate
 	// at which the socket is able to send it.
 
-	uint writeQueueSize = [self writeQueueSize];
+	NSUInteger writeQueueSize = [self writeQueueSize];
 
 	if(writeQueueSize >= READ_CHUNKSIZE) return;
 
-	uint available = READ_CHUNKSIZE - writeQueueSize;
+	NSUInteger available = READ_CHUNKSIZE - writeQueueSize;
 	NSData *data = [httpResponse readDataOfLength:available];
 
 	if([data length] > 0)
 	{
-		[responseDataSizes addObject:[NSNumber numberWithUnsignedInt:[data length]]];
+		[responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]];
 
 		BOOL isChunked = NO;
 
@@ -1152,7 +1152,7 @@ - (void)continueSendingSingleRangeResponseBody
 	// This provides an easy way for the HTTPResponse object to throttle its data allocation in step with the rate
 	// at which the socket is able to send it.
 
-	uint writeQueueSize = [self writeQueueSize];
+	NSUInteger writeQueueSize = [self writeQueueSize];
 
 	if(writeQueueSize >= READ_CHUNKSIZE) return;
 
@@ -1164,14 +1164,14 @@ - (void)continueSendingSingleRangeResponseBody
 
 	if(bytesLeft > 0)
 	{
-		uint available = READ_CHUNKSIZE - writeQueueSize;
-		uint bytesToRead = bytesLeft < available ? (uint)bytesLeft : available;
+		NSUInteger available = READ_CHUNKSIZE - writeQueueSize;
+		NSUInteger bytesToRead = bytesLeft < available ? (NSUInteger)bytesLeft : available;
 
 		NSData *data = [httpResponse readDataOfLength:bytesToRead];
 
 		if([data length] > 0)
 		{
-			[responseDataSizes addObject:[NSNumber numberWithUnsignedInt:[data length]]];
+			[responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]];
 
 			long tag = [data length] == bytesLeft ? HTTP_RESPONSE : HTTP_PARTIAL_RANGE_RESPONSE_BODY;
 			[asyncSocket writeData:data withTimeout:WRITE_BODY_TIMEOUT tag:tag];
@@ -1201,7 +1201,7 @@ - (void)continueSendingMultiRangeResponseBody
 	// This provides an easy way for the HTTPResponse object to throttle its data allocation in step with the rate
 	// at which the socket is able to send it.
 
-	uint writeQueueSize = [self writeQueueSize];
+	NSUInteger writeQueueSize = [self writeQueueSize];
 
 	if(writeQueueSize >= READ_CHUNKSIZE) return;
 
@@ -1213,14 +1213,14 @@ - (void)continueSendingMultiRangeResponseBody
 
 	if(bytesLeft > 0)
 	{
-		uint available = READ_CHUNKSIZE - writeQueueSize;
-		uint bytesToRead = bytesLeft < available ? (uint)bytesLeft : available;
+		NSUInteger available = READ_CHUNKSIZE - writeQueueSize;
+		NSUInteger bytesToRead = bytesLeft < available ? (NSUInteger)bytesLeft : available;
 
 		NSData *data = [httpResponse readDataOfLength:bytesToRead];
 
 		if([data length] > 0)
 		{
-			[responseDataSizes addObject:[NSNumber numberWithUnsignedInt:[data length]]];
+			[responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]];
 
 			[asyncSocket writeData:data withTimeout:WRITE_BODY_TIMEOUT tag:HTTP_PARTIAL_RANGES_RESPONSE_BODY];
 		}
@@ -1238,14 +1238,14 @@ - (void)continueSendingMultiRangeResponseBody
 
 			[httpResponse setOffset:range.location];
 
-			uint available = READ_CHUNKSIZE - writeQueueSize;
-			uint bytesToRead = range.length < available ? (uint)range.length : available;
+			NSUInteger available = READ_CHUNKSIZE - writeQueueSize;
+			NSUInteger bytesToRead = range.length < available ? (NSUInteger)range.length : available;
 
 			NSData *data = [httpResponse readDataOfLength:bytesToRead];
 
 			if([data length] > 0)
 			{
-				[responseDataSizes addObject:[NSNumber numberWithUnsignedInt:[data length]]];
+				[responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]];
 
 				[asyncSocket writeData:data withTimeout:WRITE_BODY_TIMEOUT tag:HTTP_PARTIAL_RANGES_RESPONSE_BODY];
 			}
@@ -1575,7 +1575,7 @@ - (NSData *)preprocessErrorResponse:(CFHTTPMessageRef)response;
 	//     
 	//     CFHTTPMessageSetBody(response, (CFDataRef)msgData);
 	//     
-	//     NSString *contentLengthStr = [NSString stringWithFormat:@"%u", (uint)[msgData length]];
+	//     NSString *contentLengthStr = [NSString stringWithFormat:@"%lu", (unsigned long)[msgData length]];
 	//     CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Length"), (CFStringRef)contentLengthStr);
 	// }
 
@@ -1772,7 +1772,11 @@ - (void)onSocket:(AsyncSocket *)sock didReadData:(NSData*)data withTag:(long)tag
 				[self prepareForBodyWithSize:requestContentLength];
 
 				// Start reading the request body
-				uint bytesToRead = requestContentLength < POST_CHUNKSIZE ? (uint)requestContentLength : POST_CHUNKSIZE;
+				NSUInteger bytesToRead;
+				if(requestContentLength < POST_CHUNKSIZE)
+					bytesToRead = (NSUInteger)requestContentLength;
+				else
+					bytesToRead = POST_CHUNKSIZE;
 
 				[asyncSocket readDataToLength:bytesToRead withTimeout:READ_TIMEOUT tag:HTTP_REQUEST_BODY];
 			}
@@ -1795,7 +1799,7 @@ - (void)onSocket:(AsyncSocket *)sock didReadData:(NSData*)data withTag:(long)tag
 			// We're not done reading the post body yet...
 			UInt64 bytesLeft = requestContentLength - requestContentLengthReceived;
 
-			uint bytesToRead = bytesLeft < POST_CHUNKSIZE ? (uint)bytesLeft : POST_CHUNKSIZE;
+			NSUInteger bytesToRead = bytesLeft < POST_CHUNKSIZE ? (NSUInteger)bytesLeft : POST_CHUNKSIZE;
 
 			[asyncSocket readDataToLength:bytesToRead withTimeout:READ_TIMEOUT tag:HTTP_REQUEST_BODY];
 		}

HTTPResponse.h

@@ -10,7 +10,7 @@
 - (UInt64)offset;
 - (void)setOffset:(UInt64)offset;
 
-- (NSData *)readDataOfLength:(unsigned int)length;
+- (NSData *)readDataOfLength:(NSUInteger)length;
 
 // Should only return YES after the HTTPConnection has read all available data.
 - (BOOL)isDone;
@@ -69,7 +69,7 @@
 
 @interface HTTPDataResponse : NSObject <HTTPResponse>
 {
-	unsigned offset;
+	NSUInteger offset;
 	NSData *data;
 }
 

HTTPResponse.m

@@ -16,7 +16,7 @@ - (id)initWithFilePath:(NSString *)filePathParam
 			return nil;
 		}
 
-		NSDictionary *fileAttributes = [[NSFileManager defaultManager] fileAttributesAtPath:filePath traverseLink:NO];
+		NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil];
 		NSNumber *fileSize = [fileAttributes objectForKey:NSFileSize];
 		fileLength = (UInt64)[fileSize unsignedLongLongValue];
 	}
@@ -46,7 +46,7 @@ - (void)setOffset:(UInt64)offset
 	[fileHandle seekToFileOffset:offset];
 }
 
-- (NSData *)readDataOfLength:(unsigned int)length
+- (NSData *)readDataOfLength:(NSUInteger)length
 {
 	return [fileHandle readDataOfLength:length];
 }
@@ -100,10 +100,10 @@ - (void)setOffset:(UInt64)offsetParam
 	offset = (unsigned)offsetParam;
 }
 
-- (NSData *)readDataOfLength:(unsigned int)lengthParameter
+- (NSData *)readDataOfLength:(NSUInteger)lengthParameter
 {
-	unsigned int remaining = [data length] - offset;
-	unsigned int length = lengthParameter < remaining ? lengthParameter : remaining;
+	NSUInteger remaining = [data length] - offset;
+	NSUInteger length = lengthParameter < remaining ? lengthParameter : remaining;
 
 	void *bytes = (void *)([data bytes] + offset);
 

HTTPServer.h

@@ -2,8 +2,14 @@
 
 @class AsyncSocket;
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
+  #define IMPLEMENTED_PROTOCOLS 
+#else
+  #define IMPLEMENTED_PROTOCOLS <NSNetServiceDelegate>
+#endif
 
-@interface HTTPServer : NSObject
+
+@interface HTTPServer : NSObject IMPLEMENTED_PROTOCOLS
 {
 	// Underlying asynchronous TCP/IP socket
 	AsyncSocket *asyncSocket;
@@ -54,6 +60,6 @@
 - (BOOL)start:(NSError **)errPtr;
 - (BOOL)stop;
 
-- (uint)numberOfHTTPConnections;
+- (NSUInteger)numberOfHTTPConnections;
 
 @end

HTTPServer.m

@@ -280,9 +280,9 @@ - (BOOL)stop
 /**
  * Returns the number of clients that are currently connected to the server.
 **/
-- (uint)numberOfHTTPConnections
+- (NSUInteger)numberOfHTTPConnections
 {
-	uint result = 0;
+	NSUInteger result = 0;
 
 	@synchronized(connections)
 	{