Skip to content

close connection when response has no body after writing headers #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paulz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

close connection when response has no body after writing headers #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
146167b
close connection when response has no body after writing headers
paulz Oct 22, 2014
4f4d530
add Podspec to allow forking the pod
paulz Oct 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions Classes/OCFWebServerConnection.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,17 @@ - (void)_processRequest {
CFHTTPMessageSetHeaderFieldValue(weakSelf.responseMessage, CFSTR("Content-Length"), (__bridge CFStringRef)[NSString stringWithFormat:@"%i", (int)weakSelf.response.contentLength]);
}
[weakSelf _writeHeadersWithCompletionBlock:^(BOOL success) {
if (success) {
if ([weakSelf.response hasBody]) {
[weakSelf _writeBodyWithCompletionBlock:^(BOOL success) {
[weakSelf.response close]; // Can't do anything with result anyway
[weakSelf close];
}];
WriteBodyCompletionBlock closeResponse = ^(BOOL _){
[weakSelf.response close];
[weakSelf close];
};
if ([weakSelf.response hasBody]) {
if (success) {
[weakSelf _writeBodyWithCompletionBlock:closeResponse];
} else {
closeResponse(NO);
}
} else if ([weakSelf.response hasBody]) {
[weakSelf.response close]; // Can't do anything with result anyway
} else {
[weakSelf close];
}
}];
Expand Down
25 changes: 25 additions & 0 deletions OCFWebServer.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Pod::Spec.new do |s|
s.name = "OCFWebServer"
s.version = "1.0.1"
s.summary = "Lightweight, modern and asynchronous HTTP server written in Objective-C."
s.description = <<-DESC
Original author: Pierre-Olivier Latour
OCFWebServer is a fork of GCDWebServer.
OCFWebServer is used by Objective-Cloud.com.
DESC
s.homepage = "https://github.com/Objective-Cloud/OCFWebServer"
s.license = 'MIT'
s.author = { "Christian Kienle" => "me@christian-kienle.de" }
s.source = { :git => "https://github.com/Objective-Cloud/OCFWebServer.git", :tag => "1.0.1" }

s.ios.deployment_target = '6.0'
s.osx.deployment_target = '10.8'
s.requires_arc = true

s.source_files = 'Classes'
s.resources = 'Assets'

s.ios.exclude_files = 'Classes/osx'
s.osx.exclude_files = 'Classes/ios'
s.public_header_files = 'Classes/*.h'
end