Merge branch 'httpserver' into testing

This commit is contained in:
Valentin Lorentz 2011-06-24 18:12:50 +02:00
commit ff2047997a

View File

@ -1061,7 +1061,7 @@ registerGlobalValue(supybot.servers.http, 'port',
registry.Integer(8080, _("""Determines what port the HTTP server will registry.Integer(8080, _("""Determines what port the HTTP server will
bind."""))) bind.""")))
registerGlobalValue(supybot.servers.http, 'keepAlive', registerGlobalValue(supybot.servers.http, 'keepAlive',
registry.Boolean(True, _("""Defines whether the server will stay alive if registry.Boolean(False, _("""Defines whether the server will stay alive if
no plugin is using it. This also means that the server will start even no plugin is using it. This also means that the server will start even
if it is not used."""))) if it is not used.""")))