From 18889793b75d7ee593d62ac88997caad850acdb6 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Wed, 19 Nov 2014 09:01:57 +0900 Subject: [PATCH] Fixed behavior of GCDWebServerOption_BonjourName option --- GCDWebServer/Core/GCDWebServer.h | 2 +- GCDWebServer/Core/GCDWebServer.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GCDWebServer/Core/GCDWebServer.h b/GCDWebServer/Core/GCDWebServer.h index b40b58f..5f122a3 100644 --- a/GCDWebServer/Core/GCDWebServer.h +++ b/GCDWebServer/Core/GCDWebServer.h @@ -79,7 +79,7 @@ extern NSString* const GCDWebServerOption_Port; * the name will automatically take the value of the GCDWebServerOption_ServerName * option. If this option is set to nil, Bonjour will be disabled. * - * The default value is an empty string. + * The default value is nil. */ extern NSString* const GCDWebServerOption_BonjourName; diff --git a/GCDWebServer/Core/GCDWebServer.m b/GCDWebServer/Core/GCDWebServer.m index b207b3c..730dce8 100644 --- a/GCDWebServer/Core/GCDWebServer.m +++ b/GCDWebServer/Core/GCDWebServer.m @@ -557,7 +557,7 @@ static inline NSString* _EncodeBase64(NSString* string) { _source6 = [self _createDispatchSourceWithListeningSocket:listeningSocket6 isIPv6:YES]; _port = port; - NSString* bonjourName = _GetOption(_options, GCDWebServerOption_BonjourName, @""); + NSString* bonjourName = _GetOption(_options, GCDWebServerOption_BonjourName, nil); NSString* bonjourType = _GetOption(_options, GCDWebServerOption_BonjourType, @"_http._tcp"); if (bonjourName) { _registrationService = CFNetServiceCreate(kCFAllocatorDefault, CFSTR("local."), (__bridge CFStringRef)bonjourType, (__bridge CFStringRef)(bonjourName.length ? bonjourName : _serverName), (SInt32)_port);