From fb637ae5ea1e4e2587062fcbc3110854f9d11be1 Mon Sep 17 00:00:00 2001
From: Otto van der Schaaf <oschaaf@gmail.com>
Date: Fri, 10 May 2013 13:23:05 +0200
Subject: [PATCH] serf: force threaded fetches

---
 src/ngx_rewrite_driver_factory.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ngx_rewrite_driver_factory.cc b/src/ngx_rewrite_driver_factory.cc
index 8da2f566e..c770c6d09 100644
--- a/src/ngx_rewrite_driver_factory.cc
+++ b/src/ngx_rewrite_driver_factory.cc
@@ -138,7 +138,7 @@ UrlAsyncFetcher* NgxRewriteDriverFactory::DefaultAsyncUrlFetcher() {
     ngx_url_async_fetcher_ = fetcher;
     return fetcher;
   } else {
-    net_instaweb::UrlAsyncFetcher* fetcher =
+    net_instaweb::SerfUrlAsyncFetcher* fetcher =
         new net_instaweb::SerfUrlAsyncFetcher(
             fetcher_proxy,
             NULL,
@@ -147,6 +147,8 @@ UrlAsyncFetcher* NgxRewriteDriverFactory::DefaultAsyncUrlFetcher() {
             timer(),
             2500,
             message_handler());
+    // Make sure we don't block the nginx event loop
+    fetcher->set_force_threaded(true);
     return fetcher;
   }
 }