Ignore SIGPIPE, still causing crashes

NEWS

@@ -9,6 +9,9 @@ httpuv 1.0.6.2
 * When onHeaders() callback returned a body, httpuv was not properly
   short-circuiting the request.
 
+* Ignore SIGPIPE permanently. This was still causing crashes under heavy
+  real-world traffic.
+
 
 httpuv 1.0.6.1
 ------------------------------------------------------------------------
@@ -28,4 +31,4 @@ httpuv 1.0.6
 httpuv 1.0.5
 ------------------------------------------------------------------------
 
-* Initial release.
+* Initial release.

src/httpuv.cpp

@@ -375,26 +375,6 @@ void stop_loop_timer_cb(uv_timer_t* handle, int status) {
   uv_stop(handle->loop);
 }
 
-#ifndef _WIN32
-// Linux uses sighandler_t and Mac uses sig_t, so define our own
-typedef void (*signal_handler_t)(int);
-
-class IgnoreSignal {
-  int _signum;
-  signal_handler_t _origHandler;
-
-public:
-  IgnoreSignal(int signum) : _signum(signum) {
-    _origHandler = signal(signum, SIG_IGN);
-  }
-
-  virtual ~IgnoreSignal() {
-    if (_origHandler != SIG_ERR)
-      signal(_signum, _origHandler);
-  }
-};
-#endif
-
 // Run the libuv default loop for roughly timeoutMillis, then stop
 // [[Rcpp::export]]
 bool run(uint32_t timeoutMillis) {
@@ -421,7 +401,7 @@ bool run(uint32_t timeoutMillis) {
   // Must ignore SIGPIPE when libuv code is running, otherwise unexpectedly
   // closing connections kill us
 #ifndef _WIN32
-  IgnoreSignal(SIGPIPE);
+  signal(SIGPIPE, SIG_IGN);
 #endif
   return uv_run(uv_default_loop(), UV_RUN_ONCE);
 }