Django

Code

Show
Ignore:
Timestamp:
02/15/08 11:05:48 (11 months ago)
Author:
jkocherhans
Message:

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

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-7021 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-7120

  • django/branches/newforms-admin/django/middleware/gzip.py

    r6777 r7121  
    2323            return response 
    2424 
    25         # Older versions of IE have issues with gzipped javascript. 
    26         # See http://code.djangoproject.com/ticket/2449 
    27         is_ie = "msie" in request.META.get('HTTP_USER_AGENT', '').lower() 
    28         is_js = "javascript" in response.get('Content-Type', '').lower() 
    29         if is_ie and is_js: 
    30             return response 
     25        # Older versions of IE have issues with gzipped pages containing either 
     26        # Javascript and PDF. 
     27        if "msie" in request.META.get('HTTP_USER_AGENT', '').lower(): 
     28            ctype = response.get('Content-Type', '').lower() 
     29            if "javascript" in ctype or ctype == "application/pdf": 
     30                return response 
    3131 
    3232        ae = request.META.get('HTTP_ACCEPT_ENCODING', '')