diff options
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/gpgv.cc | 2 | ||||
| -rw-r--r-- | methods/http.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 470b47fd4..150c1d315 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -292,7 +292,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm) // least one bad signature. good signatures and NoPubKey signatures // happen easily when a file is signed with multiple signatures if(GoodSigners.empty() or !BadSigners.empty()) - return _error->Error(errmsg.c_str()); + return _error->Error("%s", errmsg.c_str()); } // Just pass the raw output up, because passing it as a real data diff --git a/methods/http.cc b/methods/http.cc index 1bf798da4..006e89394 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1316,9 +1316,11 @@ 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(); } |