Changeset 1948

Timestamp:

09/05/08 13:12:41 (4 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/admin/PageAdvanced.py (modified) (5 diffs)
• cherokee/trunk/admin/PageGeneral.py (modified) (4 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-09-05  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * admin/PageAdvanced.py, admin/PageGeneral.py: The keepalive
+        option has been moved to the advanced page. A new option to enable
+        or disable Chunked encoding has been added as well.
-
-        * cherokee/connection-protected.h, cherokee/handler_cgi_base.c,

cherokee/trunk/admin/PageAdvanced.py

@@ -16 +16 @@
-    ('server!max_connection_reuse',   validations.is_positive_int),
-    ('server!log_flush_elapse',       validations.is_positive_int),
+    ("server!keepalive",              validations.is_boolean),
-    ('server!keepalive_max_requests', validations.is_positive_int)
-]
@@ -36 +37 @@
-NOTE_REUSE_CONNS  = 'Set the number of how many internal connections can be held for reuse by each thread. Default 20.'
-NOTE_FLUSH_TIME   = 'Sets the number of seconds between log consolidations (flushes). Default: 10 seconds.'
+NOTE_KEEPALIVE    = 'Enables the server-wide keep-alive support. It increases the performance. It is usually set on.'
-NOTE_KEEPALIVE_RS = 'Maximum number of HTTP requests that can be served by each keepalive connection.'
-
+
-
-class PageAdvanced (PageMenu, FormHelper):
@@ -60 +62 @@
-        txt += self.Dialog(WARNING, 'warning')
-
+        txt += "<h2>Connections management</h2>"
+        table = TableProps()
+        self.AddPropCheck    (table, 'Keep Alive',         'server!keepalive', True, NOTE_KEEPALIVE)        
+        self.AddPropEntry    (table, 'Max keepalive reqs', 'server!keepalive_max_requests', NOTE_KEEPALIVE_RS)
+        self.AddPropCheck    (table, 'Chunked Encoding',   'server!chunked_encoding', True, NOTE_CHUNKED)        
+        txt += self.Indent(table)
+
-        txt += "<h2>System tweaking</h2>"
-        table = TableProps()
@@ -81 +90 @@
-        self.AddPropEntry    (table, 'Reuse connections',      'server!max_connection_reuse',   NOTE_REUSE_CONNS)
-        self.AddPropEntry    (table, 'Log flush time',         'server!log_flush_elapse',       NOTE_FLUSH_TIME)
-        self.AddPropEntry    (table, 'Max keepalive reqs',     'server!keepalive_max_requests', NOTE_KEEPALIVE_RS)
-        txt += self.Indent(table)
-
@@ -88 +96 @@
-
-    def _op_apply_changes (self, uri, post):
-
+
+
-

cherokee/trunk/admin/PageGeneral.py

@@ -16 +16 @@
-
-DATA_VALIDATION = [
-    ("server!keepalive", validations.is_boolean),
-    ("server!ipv6",      validations.is_boolean),
-    ("server!port.*",    validations.is_tcp_port),
@@ -28 +27 @@
-NOTE_LISTEN    = 'IP address of the interface to bind. It is usually empty.'
-NOTE_TIMEOUT   = 'Time interval until the server closes inactive connections.'
-NOTE_KEEPALIVE = 'Enables the server-wide keep-alive support. It increases the performance. It is usually set on.'
-NOTE_TOKENS    = 'This option allows to choose how the server identifies itself.'
-NOTE_USER      = 'Changes the effective user. User names and IDs are accepted.'
@@ -60 +58 @@
-        table = TableProps()
-        self.AddPropEntry (table,  'Timeout (<i>secs</i>)', 'server!timeout',  NOTE_TIMEOUT)
-        self.AddPropCheck (table,  'Keep Alive',            'server!keepalive', True, NOTE_KEEPALIVE)
-        self.AddPropOptions(table, 'Server Tokens',         'server!server_tokens', PRODUCT_TOKENS, NOTE_TOKENS)
-        txt += self.Indent(table)
@@ -75 +72 @@
-        
-    def _op_apply_changes (self, uri, post):
-, 'server!keepalive'], post, 
-validation = DATA_VALIDATION)
+], post, validation = DATA_VALIDATION)
+