Django

Code

Show
Ignore:
Timestamp:
12/18/07 23:20:55 (1 year ago)
Author:
jkocherhans
Message:

newforms-admin: Merged from trunk up to [6952].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6863 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6952
  • django/branches/newforms-admin/django/views/static.py

    r6777 r6955  
    6060                              statobj[stat.ST_MTIME], statobj[stat.ST_SIZE]): 
    6161        return HttpResponseNotModified() 
    62     mimetype = mimetypes.guess_type(fullpath)[0] 
     62    mimetype = mimetypes.guess_type(fullpath)[0] or 'application/octet-stream' 
    6363    contents = open(fullpath, 'rb').read() 
    6464    response = HttpResponse(contents, mimetype=mimetype) 
    6565    response["Last-Modified"] = http_date(statobj[stat.ST_MTIME]) 
     66    response["Content-Length"] = len(contents) 
    6667    return response 
    6768