Merge pull request #358 from pagespeed/oschaaf-serf-force-threaded

serf: force threaded fetches
2013-05-10 05:25:22 -07:00
parent 3a01a398e2 fb637ae5ea
commit 6e1ab54c6b
1 changed files with 3 additions and 1 deletions
@@ -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;
  }
 }