This obsoletes id:1465043356-23420-2-git-send-email-david@tethera.net I investigated adding a timeout (including talking a bit to Xapian upstream about it), and thought about some runtime configuration options, but for now I settled on a configure. Depending what experiences people report, we would make the default disabled for the next release.