Merge branch 'master' of github.com:robbiehanson/CocoaHTTPServer

robbiehanson · Mar 19, 2012 · 05d0ea7 · 05d0ea7
2 parents 583887b + 22e35dc
commit 05d0ea7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
+.DS_Store
 *.pbxuser
 *.mode1v3
 *.mode2v3
 xcuserdata
+*~
diff --git a/Core/HTTPConnection.m b/Core/HTTPConnection.m
@@ -2194,6 +2194,7 @@ - (void)socket:(GCDAsyncSocket *)sock didReadData:(NSData*)data withTag:(long)ta
 
 			NSString *sizeLine = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
 
+			errno = 0;  // Reset errno before calling strtoull() to ensure it is always zero on success
 			requestChunkSize = (UInt64)strtoull([sizeLine UTF8String], NULL, 16);
 			requestChunkSizeReceived = 0;