From ea1924994e4bb51202e9090f66d55aecbd790391 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Sat, 22 Mar 2014 20:16:26 -0700 Subject: [PATCH] Changed default port to 80 on iOS but still 8080 on Mac & iOS Simulator --- CGDWebServer/GCDWebServer.h | 2 +- CGDWebServer/GCDWebServer.m | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CGDWebServer/GCDWebServer.h b/CGDWebServer/GCDWebServer.h index 3ede5be..2d2b415 100644 --- a/CGDWebServer/GCDWebServer.h +++ b/CGDWebServer/GCDWebServer.h @@ -50,7 +50,7 @@ NSDictionary* GCDWebServerParseURLEncodedForm(NSString* form); - (void)addHandlerWithMatchBlock:(GCDWebServerMatchBlock)matchBlock processBlock:(GCDWebServerProcessBlock)processBlock; - (void)removeAllHandlers; -- (BOOL)start; // Default is 8080 port and computer name +- (BOOL)start; // Default is port 8080 (Mac & iOS Simulator) or 80 (iOS) and computer name - (BOOL)startWithPort:(NSUInteger)port bonjourName:(NSString*)name; // Pass nil name to disable Bonjour or empty string to use computer name - (void)stop; @end diff --git a/CGDWebServer/GCDWebServer.m b/CGDWebServer/GCDWebServer.m index 4fbaad4..d5a5545 100644 --- a/CGDWebServer/GCDWebServer.m +++ b/CGDWebServer/GCDWebServer.m @@ -34,6 +34,11 @@ #import "GCDWebServerPrivate.h" +#if TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR +#define kDefaultPort 80 +#else +#define kDefaultPort 8080 +#endif #define kMaxPendingConnections 16 @interface GCDWebServer () { @@ -190,7 +195,7 @@ static void _SignalHandler(int signal) { } - (BOOL)start { - return [self startWithPort:8080 bonjourName:@""]; + return [self startWithPort:kDefaultPort bonjourName:@""]; } static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* error, void* info) {