From f0c63f4776e57210a0e5caf071ac8d1eaa471e26 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Thu, 17 Apr 2014 10:41:33 -0300 Subject: [PATCH] Fixes --- GCDWebServer/Core/GCDWebServerConnection.h | 2 +- GCDWebServer/Core/GCDWebServerConnection.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GCDWebServer/Core/GCDWebServerConnection.h b/GCDWebServer/Core/GCDWebServerConnection.h index ad88be0..43242af 100644 --- a/GCDWebServer/Core/GCDWebServerConnection.h +++ b/GCDWebServer/Core/GCDWebServerConnection.h @@ -46,6 +46,6 @@ - (void)didWriteBytes:(const void*)bytes length:(NSUInteger)length; // Called after data has been written to the connection - (GCDWebServerResponse*)processRequest:(GCDWebServerRequest*)request withBlock:(GCDWebServerProcessBlock)block; // Only called if the request can be processed - (GCDWebServerResponse*)replaceResponse:(GCDWebServerResponse*)response forRequest:(GCDWebServerRequest*)request; // Default implementation replaces any response matching the "ETag" or "Last-Modified-Date" header of the request by a barebone "Not-Modified" (304) one -- (void)abortRequest:(GCDWebServerRequest*)request withStatusCode:(NSInteger)statusCode; // If request headers was malformed, "request" will be nil +- (void)abortRequest:(GCDWebServerRequest*)request withStatusCode:(NSInteger)statusCode; // If request headers were malformed, "request" will be nil - (void)close; @end diff --git a/GCDWebServer/Core/GCDWebServerConnection.m b/GCDWebServer/Core/GCDWebServerConnection.m index 149e026..e58875d 100644 --- a/GCDWebServer/Core/GCDWebServerConnection.m +++ b/GCDWebServer/Core/GCDWebServerConnection.m @@ -529,7 +529,7 @@ static inline NSUInteger _ScanHexNumber(const void* bytes, NSUInteger size) { if ([_request hasBody]) { [_request prepareForWriting]; if (_request.usesChunkedTransferEncoding || (extraData.length <= _request.contentLength)) { - NSString* expectHeader = ARC_BRIDGE_RELEASE(CFHTTPMessageCopyHeaderFieldValue(_requestMessage, CFSTR("Expect"))); + NSString* expectHeader = [requestHeaders objectForKey:@"Expect"]; if (expectHeader) { if ([expectHeader caseInsensitiveCompare:@"100-continue"] == NSOrderedSame) { [self _writeData:_continueData withCompletionBlock:^(BOOL success) {