Merged in bisque/paste (pull request #11)

Small changes for turbogears

2 files changed, 4 insertions, 3 deletions

diff --git a/paste/fileapp.py b/paste/fileapp.py
index 8432511..6c42072 100644
--- a/paste/fileapp.py
+++ b/paste/fileapp.py
@@ -158,10 +158,10 @@ class DataApp(object):
         CONTENT_RANGE.update(headers, first_byte=lower, last_byte=upper,
                             total_length = self.content_length)
         CONTENT_LENGTH.update(headers, content_length)
-        if content_length == self.content_length:
-            start_response('200 OK', headers)
-        else:
+        if range or content_length != self.content_length:
             start_response('206 Partial Content', headers)
+        else:
+            start_response('200 OK', headers)
         if self.content is not None:
             return [self.content[lower:upper+1]]
         return (lower, content_length)
diff --git a/paste/httpserver.py b/paste/httpserver.py
index ffc94c3..b7d6640 100755
--- a/paste/httpserver.py
+++ b/paste/httpserver.py
@@ -27,6 +27,7 @@ import os
 from itertools import count
 from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
 from SocketServer import ThreadingMixIn
+from StringIO import StringIO
 from paste.util import converters
 import logging
 try: