merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -13,6 +13,8 @@ Fixed:
 - fixed RDBMS filter() for no matches from full-text search (sf bug 990778)
 - fixed DateHTMLProperty for invalid date entry (sf bug 986538)
 - fixed external password source example (sf bug 986601)
+- document the STATIC_FILES config var
+- implement the HTTP HEAD command (sf bug 992544)
 
 
 2004-06-24 0.7.5

doc/customizing.txt

@@ -118,6 +118,11 @@ The configuration variables available are:
  This is the directory that the HTML templates reside in. By default they are
  in the tracker home.
 
+**STATIC_FILES** - e.g. ``os.path.join(TRACKER_HOME, 'files')``
+ This *optional* variable defines the directory that static files are served
+ from (files with the URL ``/@@file/<filename>``). If this is not defined,
+ then static files are served from the TEMPLATES directory.
+
 **TRACKER_NAME** - ``'Roundup issue tracker'``
  A descriptive name for your roundup tracker. This is sent out in e-mails and
  appears in the heading of CGI pages.
@@ -227,6 +232,11 @@ tracker is attempted.::
     # This is the directory that the HTML templates reside in
     TEMPLATES = os.path.join(TRACKER_HOME, 'html')
 
+    # Optional: the directory that static files are served from (files with
+    # the URL /@@file/<filename>). If this is not defined, then static files
+    # are served from the TEMPLATES directory.
+    # STATIC_FILES = os.path.join(TRACKER_HOME, 'files')
+
     # A descriptive name for your roundup tracker
     TRACKER_NAME = 'Roundup issue tracker'
 

roundup/cgi/actions.py

@@ -1,4 +1,4 @@
-#$Id: actions.py,v 1.27.2.3 2004-05-28 01:03:53 richard Exp $
+#$Id: actions.py,v 1.27.2.4 2004-07-20 02:10:43 richard Exp $
 
 import re, cgi, StringIO, urllib, Cookie, time, random
 
@@ -859,7 +859,13 @@ def handle(self):
         h['Content-Type'] = 'text/csv'
         # some browsers will honor the filename here...
         h['Content-Disposition'] = 'inline; filename=query.csv'
+
         self.client.header()
+
+        if self.client.env['REQUEST_METHOD'] == 'HEAD':
+            # all done, return a dummy string
+            return 'dummy'
+
         writer = rcsv.writer(self.client.request.wfile)
         writer.writerow(columns)
 

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.176.2.2 2004-06-22 23:36:49 richard Exp $
+# $Id: client.py,v 1.176.2.3 2004-07-20 02:10:43 richard Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -596,7 +596,8 @@ def handle_action(self):
     def write(self, content):
         if not self.headers_done:
             self.header()
-        self.request.wfile.write(content)
+        if self.env['REQUEST_METHOD'] != 'HEAD':
+            self.request.wfile.write(content)
 
     def setHeader(self, header, value):
         '''Override a header to be returned to the user's browser.

roundup/scripts/roundup_server.py

@@ -17,7 +17,7 @@
 
 """Command-line script that runs a server over roundup.cgi.client.
 
-$Id: roundup_server.py,v 1.46.2.4 2004-06-21 04:56:34 richard Exp $
+$Id: roundup_server.py,v 1.46.2.5 2004-07-20 02:10:43 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -118,7 +118,7 @@ def run_cgi(self):
                     self.wfile.write("</pre>\n")
         sys.stdin = save_stdin
 
-    do_GET = do_POST = run_cgi
+    do_GET = do_POST = do_HEAD = run_cgi
 
     def index(self):
         ''' Print up an index of the available trackers

templates/classic/config.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: config.py,v 1.8 2004-03-26 23:45:34 richard Exp $
+# $Id: config.py,v 1.8.2.1 2004-07-20 02:10:43 richard Exp $
 
 import os
 
@@ -48,6 +48,11 @@
 # This is the directory that the HTML templates reside in
 TEMPLATES = os.path.join(TRACKER_HOME, 'html')
 
+# Optional: the directory that static files are served from (files with the
+# URL /@@file/<filename>). If this is not defined, then static files are
+# served from the TEMPLATES directory.
+# STATIC_FILES = os.path.join(TRACKER_HOME, 'files')
+
 # A descriptive name for your roundup instance
 TRACKER_NAME = 'Roundup issue tracker'