diff --git a/GCDWebServer/Core/GCDWebServer.h b/GCDWebServer/Core/GCDWebServer.h index 01084f4..e80e485 100644 --- a/GCDWebServer/Core/GCDWebServer.h +++ b/GCDWebServer/Core/GCDWebServer.h @@ -284,23 +284,6 @@ extern NSString* const GCDWebServerAuthenticationMethod_DigestAccess; */ - (void)removeAllHandlers; -/** - * Starts the server on port 8080 (OS X & iOS Simulator) or port 80 (iOS) - * using the computer / device name for as the Bonjour name. - * - * Returns NO if the server failed to start. - */ -- (BOOL)start; - -/** - * Starts the server on a given port and with a specific Bonjour name. - * Pass a nil Bonjour name to disable Bonjour entirely or an empty string to - * use the computer / device name. - * - * Returns NO if the server failed to start. - */ -- (BOOL)startWithPort:(NSUInteger)port bonjourName:(NSString*)name; - /** * Starts the server with explicit options. This method is the designated way * to start the server. @@ -337,6 +320,23 @@ extern NSString* const GCDWebServerAuthenticationMethod_DigestAccess; */ @property(nonatomic, readonly) NSURL* bonjourServerURL; +/** + * Starts the server on port 8080 (OS X & iOS Simulator) or port 80 (iOS) + * using the computer / device name for as the Bonjour name. + * + * Returns NO if the server failed to start. + */ +- (BOOL)start; + +/** + * Starts the server on a given port and with a specific Bonjour name. + * Pass a nil Bonjour name to disable Bonjour entirely or an empty string to + * use the computer / device name. + * + * Returns NO if the server failed to start. + */ +- (BOOL)startWithPort:(NSUInteger)port bonjourName:(NSString*)name; + #if !TARGET_OS_IPHONE /** diff --git a/GCDWebServer/Core/GCDWebServer.m b/GCDWebServer/Core/GCDWebServer.m index a3ddc8d..ed54810 100644 --- a/GCDWebServer/Core/GCDWebServer.m +++ b/GCDWebServer/Core/GCDWebServer.m @@ -528,17 +528,6 @@ static inline NSString* _EncodeBase64(NSString* string) { } } -- (BOOL)start { - return [self startWithPort:kDefaultPort bonjourName:@""]; -} - -- (BOOL)startWithPort:(NSUInteger)port bonjourName:(NSString*)name { - NSMutableDictionary* options = [NSMutableDictionary dictionary]; - [options setObject:[NSNumber numberWithInteger:port] forKey:GCDWebServerOption_Port]; - [options setValue:name forKey:GCDWebServerOption_BonjourName]; - return [self startWithOptions:options]; -} - #if TARGET_OS_IPHONE - (void)_didEnterBackground:(NSNotification*)notification { @@ -640,6 +629,17 @@ static inline NSString* _EncodeBase64(NSString* string) { return nil; } +- (BOOL)start { + return [self startWithPort:kDefaultPort bonjourName:@""]; +} + +- (BOOL)startWithPort:(NSUInteger)port bonjourName:(NSString*)name { + NSMutableDictionary* options = [NSMutableDictionary dictionary]; + [options setObject:[NSNumber numberWithInteger:port] forKey:GCDWebServerOption_Port]; + [options setValue:name forKey:GCDWebServerOption_BonjourName]; + return [self startWithOptions:options]; +} + #if !TARGET_OS_IPHONE - (BOOL)runWithPort:(NSUInteger)port bonjourName:(NSString*)name {