Ticket #123: xapian-remote-server-timeout.patch

net/remoteserver.cc

@@ -200 +200 @@
                 throw Xapian::InvalidArgumentError(errmsg);
             }
             (this->*(dispatch[type]))(message);
+        } catch (const Xapian::NetworkTimeoutError & e) {
+            try {
+                // We've had a timeout, so the client may not be listening, so
+                // if we can't send the message right away, just exit and the
+                // client will cope.
+                RemoteConnection::send_message(REPLY_EXCEPTION, serialise_error(e), OmTime::now());
+            } catch (...) {
+            }
+            // Exit after a timeout.
+            return;
         } catch (const Xapian::Error &e) {
             // Propagate the exception across the connection, then return to
             // the main message handling loop.