Changeset 253 for trunk

Timestamp:

07/19/07 16:51:59 (5 years ago)

Author:

marc

Message:

Added server version support.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• server.py (modified) (6 diffs)

trunk/ChangeLog

@@ -11 +11 @@
 0.2.1:
  * Fixed a serious security bug in which /screenshot prompted no auth. Also
- fixed sending the wrong Content-Lenght for the screenshot.
+ fixed sending the wrong Content-Lenght for the screenshot. Report Itaka
+ version on HTTP headers.
 
 0.2 (I've been watching you...):

trunk/server.py

@@ -94 +94 @@
         getattr(self, name).putChild(path, resource)
 
-    def create_site(self, resource):
+    def create_site(self, resource, version_header='TwistedWeb/' + twisted.copyright.version):
         """
         Creates a Twisted.server.Site with a Twisted Resource
@@ -100 +100 @@
         @type resource: instance
         @param resource: An instance of a Twisted resource created with L{add_static_resource}
-        """
-
+
+        @type version_header: str
+        @param version_header: The 'Server: str' that is sent on HTTP headers. Defaults to Twisted's.
+        """
+        server.version = version_header
         self.site = server.Site(resource)
 
@@ -203 +206 @@
         self.add_child_to_resource('root', 'favicon.ico', FileResource(self.gui, self.authresource, os.path.join(self.itaka_globals.image_dir, 'favicon.ico'), 'image/x-icon'))
 
-        self.create_site(self.root)
+        self.create_site(self.root, 'Itaka/%s (TwistedWeb/%s)' % (self.itaka_globals.__version__, twisted.copyright.version))
 
 
@@ -340 +343 @@
         """
 
+        self.children = {}
+
         self.gui = gui_instance
         self.auth = auth_instance
         self.configuration = self.gui.configuration
 
-        # Inherited from the actual code of Twisted's static.Data
-        self.children = {}
         self.data = data
         self.size = str(len(self.data))
@@ -394 +397 @@
         """
 
+        self.children = {}
+
         self.gui = gui_instance
         self.auth = auth_instance
         self.itaka_globals = self.gui.itaka_globals
-
+            
         self.type = type
         self.data = open(path, 'rb').read()
@@ -439 +444 @@
         """
 
+        self.children = {}
+
         self.gui = gui_instance
         self.auth = auth_instance
         self.console = self.gui.console
         self.itaka_globals = self.gui.itaka_globals
+
         self.screenshot = screenshot.Screenshot(self.gui)