diff --git a/GCDWebServer.xcodeproj/project.pbxproj b/GCDWebServer.xcodeproj/project.pbxproj index 564b54e..49bd580 100644 --- a/GCDWebServer.xcodeproj/project.pbxproj +++ b/GCDWebServer.xcodeproj/project.pbxproj @@ -54,8 +54,8 @@ E28BAE4918F99C810095C089 /* GCDWebServerErrorResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE2F18F99C810095C089 /* GCDWebServerErrorResponse.m */; }; E28BAE4A18F99C810095C089 /* GCDWebServerFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE3118F99C810095C089 /* GCDWebServerFileResponse.m */; }; E28BAE4B18F99C810095C089 /* GCDWebServerFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE3118F99C810095C089 /* GCDWebServerFileResponse.m */; }; - E28BAE4C18F99C810095C089 /* GCDWebServerStreamingResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE3318F99C810095C089 /* GCDWebServerStreamingResponse.m */; }; - E28BAE4D18F99C810095C089 /* GCDWebServerStreamingResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE3318F99C810095C089 /* GCDWebServerStreamingResponse.m */; }; + E28BAE4C18F99C810095C089 /* GCDWebServerStreamedResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE3318F99C810095C089 /* GCDWebServerStreamedResponse.m */; }; + E28BAE4D18F99C810095C089 /* GCDWebServerStreamedResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE3318F99C810095C089 /* GCDWebServerStreamedResponse.m */; }; E2A0E80A18F3432600C580B1 /* GCDWebDAVServer.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A0E80918F3432600C580B1 /* GCDWebDAVServer.m */; }; E2A0E80B18F3432600C580B1 /* GCDWebDAVServer.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A0E80918F3432600C580B1 /* GCDWebDAVServer.m */; }; E2A0E80D18F35C9A00C580B1 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2A0E80C18F35C9A00C580B1 /* libxml2.dylib */; }; @@ -138,8 +138,8 @@ E28BAE2F18F99C810095C089 /* GCDWebServerErrorResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerErrorResponse.m; sourceTree = ""; }; E28BAE3018F99C810095C089 /* GCDWebServerFileResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerFileResponse.h; sourceTree = ""; }; E28BAE3118F99C810095C089 /* GCDWebServerFileResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerFileResponse.m; sourceTree = ""; }; - E28BAE3218F99C810095C089 /* GCDWebServerStreamingResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerStreamingResponse.h; sourceTree = ""; }; - E28BAE3318F99C810095C089 /* GCDWebServerStreamingResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerStreamingResponse.m; sourceTree = ""; }; + E28BAE3218F99C810095C089 /* GCDWebServerStreamedResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServerStreamedResponse.h; sourceTree = ""; }; + E28BAE3318F99C810095C089 /* GCDWebServerStreamedResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServerStreamedResponse.m; sourceTree = ""; }; E2A0E80818F3432600C580B1 /* GCDWebDAVServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebDAVServer.h; sourceTree = ""; }; E2A0E80918F3432600C580B1 /* GCDWebDAVServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebDAVServer.m; sourceTree = ""; }; E2A0E80C18F35C9A00C580B1 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/usr/lib/libxml2.dylib; sourceTree = DEVELOPER_DIR; }; @@ -300,8 +300,8 @@ E28BAE2F18F99C810095C089 /* GCDWebServerErrorResponse.m */, E28BAE3018F99C810095C089 /* GCDWebServerFileResponse.h */, E28BAE3118F99C810095C089 /* GCDWebServerFileResponse.m */, - E28BAE3218F99C810095C089 /* GCDWebServerStreamingResponse.h */, - E28BAE3318F99C810095C089 /* GCDWebServerStreamingResponse.m */, + E28BAE3218F99C810095C089 /* GCDWebServerStreamedResponse.h */, + E28BAE3318F99C810095C089 /* GCDWebServerStreamedResponse.m */, ); path = Responses; sourceTree = ""; @@ -437,7 +437,7 @@ E28BAE3618F99C810095C089 /* GCDWebServerConnection.m in Sources */, E28BAE3C18F99C810095C089 /* GCDWebServerResponse.m in Sources */, E28BAE4018F99C810095C089 /* GCDWebServerFileRequest.m in Sources */, - E28BAE4C18F99C810095C089 /* GCDWebServerStreamingResponse.m in Sources */, + E28BAE4C18F99C810095C089 /* GCDWebServerStreamedResponse.m in Sources */, E28BAE3E18F99C810095C089 /* GCDWebServerDataRequest.m in Sources */, E2A0E80A18F3432600C580B1 /* GCDWebDAVServer.m in Sources */, E28BAE4218F99C810095C089 /* GCDWebServerMultiPartFormRequest.m in Sources */, @@ -457,7 +457,7 @@ E28BAE4B18F99C810095C089 /* GCDWebServerFileResponse.m in Sources */, E28BAE3918F99C810095C089 /* GCDWebServerFunctions.m in Sources */, E28BAE4118F99C810095C089 /* GCDWebServerFileRequest.m in Sources */, - E28BAE4D18F99C810095C089 /* GCDWebServerStreamingResponse.m in Sources */, + E28BAE4D18F99C810095C089 /* GCDWebServerStreamedResponse.m in Sources */, E28BAE3F18F99C810095C089 /* GCDWebServerDataRequest.m in Sources */, E2BE850B18E77ECA0061360B /* GCDWebUploader.m in Sources */, E22112951690B64F0048D2B2 /* AppDelegate.m in Sources */, diff --git a/GCDWebServer/Core/GCDWebServerPrivate.h b/GCDWebServer/Core/GCDWebServerPrivate.h index d29f2eb..ce9d86d 100644 --- a/GCDWebServer/Core/GCDWebServerPrivate.h +++ b/GCDWebServer/Core/GCDWebServerPrivate.h @@ -67,7 +67,7 @@ #import "GCDWebServerDataResponse.h" #import "GCDWebServerErrorResponse.h" #import "GCDWebServerFileResponse.h" -#import "GCDWebServerStreamingResponse.h" +#import "GCDWebServerStreamedResponse.h" #ifdef __GCDWEBSERVER_LOGGING_HEADER__ diff --git a/GCDWebServer/Responses/GCDWebServerStreamingResponse.h b/GCDWebServer/Responses/GCDWebServerStreamedResponse.h similarity index 82% rename from GCDWebServer/Responses/GCDWebServerStreamingResponse.h rename to GCDWebServer/Responses/GCDWebServerStreamedResponse.h index fc2b6e0..2cb6d13 100644 --- a/GCDWebServer/Responses/GCDWebServerStreamingResponse.h +++ b/GCDWebServer/Responses/GCDWebServerStreamedResponse.h @@ -25,29 +25,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import "GCDWebServerStreamingResponse.h" +#import "GCDWebServerStreamedResponse.h" /** - * The GCDWebServerStreamBlock is called to stream the data for the HTTP body. + * The GCDWebServerStreamingBlock is called to stream the data for the HTTP body. * The block must return empty NSData when done or nil on error and set the * "error" argument which is guaranteed to be non-NULL. */ -typedef NSData* (^GCDWebServerStreamBlock)(NSError** error); +typedef NSData* (^GCDWebServerStreamingBlock)(NSError** error); /** - * The GCDWebServerStreamingResponse subclass of GCDWebServerResponse streams + * The GCDWebServerStreamedResponse subclass of GCDWebServerResponse streams * the body of the HTTP response using a GCD block. */ -@interface GCDWebServerStreamingResponse : GCDWebServerResponse +@interface GCDWebServerStreamedResponse : GCDWebServerResponse /** * Creates a response with streamed data and a given content type. */ -+ (instancetype)responseWithContentType:(NSString*)type streamBlock:(GCDWebServerStreamBlock)block; ++ (instancetype)responseWithContentType:(NSString*)type streamBlock:(GCDWebServerStreamingBlock)block; /** * This method is the designated initializer for the class. */ -- (instancetype)initWithContentType:(NSString*)type streamBlock:(GCDWebServerStreamBlock)block; +- (instancetype)initWithContentType:(NSString*)type streamBlock:(GCDWebServerStreamingBlock)block; @end diff --git a/GCDWebServer/Responses/GCDWebServerStreamingResponse.m b/GCDWebServer/Responses/GCDWebServerStreamedResponse.m similarity index 91% rename from GCDWebServer/Responses/GCDWebServerStreamingResponse.m rename to GCDWebServer/Responses/GCDWebServerStreamedResponse.m index 4ed68d4..47b0b1f 100644 --- a/GCDWebServer/Responses/GCDWebServerStreamingResponse.m +++ b/GCDWebServer/Responses/GCDWebServerStreamedResponse.m @@ -27,19 +27,19 @@ #import "GCDWebServerPrivate.h" -@interface GCDWebServerStreamingResponse () { +@interface GCDWebServerStreamedResponse () { @private - GCDWebServerStreamBlock _block; + GCDWebServerStreamingBlock _block; } @end -@implementation GCDWebServerStreamingResponse +@implementation GCDWebServerStreamedResponse -+ (instancetype)responseWithContentType:(NSString*)type streamBlock:(GCDWebServerStreamBlock)block { ++ (instancetype)responseWithContentType:(NSString*)type streamBlock:(GCDWebServerStreamingBlock)block { return ARC_AUTORELEASE([[[self class] alloc] initWithContentType:type streamBlock:block]); } -- (instancetype)initWithContentType:(NSString*)type streamBlock:(GCDWebServerStreamBlock)block { +- (instancetype)initWithContentType:(NSString*)type streamBlock:(GCDWebServerStreamingBlock)block { if ((self = [super init])) { _block = [block copy]; diff --git a/Mac/main.m b/Mac/main.m index dba6b7f..8c9aaf9 100644 --- a/Mac/main.m +++ b/Mac/main.m @@ -33,7 +33,7 @@ #import "GCDWebServerURLEncodedFormRequest.h" #import "GCDWebServerDataResponse.h" -#import "GCDWebServerStreamingResponse.h" +#import "GCDWebServerStreamedResponse.h" #import "GCDWebDAVServer.h" @@ -267,7 +267,7 @@ int main(int argc, const char* argv[]) { processBlock:^GCDWebServerResponse *(GCDWebServerRequest* request) { __block int countDown = 10; - return [GCDWebServerStreamingResponse responseWithContentType:@"text/plain" streamBlock:^NSData *(NSError** error) { + return [GCDWebServerStreamedResponse responseWithContentType:@"text/plain" streamBlock:^NSData *(NSError** error) { usleep(100 * 1000); if (countDown) {