diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-07-30 18:25:16 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-07-30 18:25:16 +0200 |
commit | 056539eeb8eb84cea65c0c15466111b978ee156d (patch) | |
tree | 354f2bcc2a4883e44a7c36cc670577fd641252a2 /methods/http.cc | |
parent | 55fb35e87a1ff550cbb3010c5a03064f0a2b10be (diff) |
methods/http.cc: remove merge artifact
Diffstat (limited to 'methods/http.cc')
-rw-r--r-- | methods/http.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/methods/http.cc b/methods/http.cc index 476fb751f..859dbd39c 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1316,15 +1316,4 @@ int HttpMethod::Loop() } /*}}}*/ -int main() -{ - setlocale(LC_ALL, ""); - // ignore SIGPIPE, this can happen on write() if the socket - // closes the connection (this is dealt with via ServerDie()) - signal(SIGPIPE, SIG_IGN); - - HttpMethod Mth; - return Mth.Loop(); -} - |