Merge pull request #1543 from chrox/plugable-turbo

disable turbo lib by default
koreader · Jun 3, 2015 · a30fe26 · a30fe26
2 parents d239a1c + a596219
commit a30fe26
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/base b/base
diff --git a/defaults.lua b/defaults.lua
@@ -182,6 +182,10 @@ KOBO_SCREEN_SAVER_LAST_BOOK = true -- get screensaver from last book if possible
 -- proxy authentication is not supported yet.
 NETWORK_PROXY = nil
 
+-- Experimental features
+-- Use turbo library to handle async HTTP request
+DUSE_TURBO_LIB = false
+
 -- ####################################################################
 -- following features are not supported right now
 -- ####################################################################

diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua
@@ -523,7 +523,7 @@ function UIManager:handleInput()
 end
 
 function UIManager:initLooper()
-    if not self.looper and ffi.os ~= "Windows" then
+    if DUSE_TURBO_LIB and not self.looper then
         TURBO_SSL = true
         __TURBO_USE_LUASOCKET__ = true
         local turbo = require("turbo")

diff --git a/spec/unit/commonrequire.lua b/spec/unit/commonrequire.lua
@@ -21,3 +21,6 @@ Input.dummy = true
 -- turn on debug
 local DEBUG = require("dbg")
 --DEBUG:turnOn()
+
+-- use turbo lib in test
+DUSE_TURBO_LIB = true