Merge pull request #1543 from chrox/plugable-turbo

disable turbo lib by default
This commit is contained in:
Qingping Hou
2015-06-03 12:47:07 -04:00
4 changed files with 9 additions and 2 deletions

2
base

Submodule base updated: 6edadeb61b...cd68f482e0

View File

@@ -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
-- ####################################################################

View File

@@ -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")

View File

@@ -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