Django

Code

Show
Ignore:
Timestamp:
07/04/08 15:16:22 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7772-7808,7811-7814,7816-7823,7826-7829,7831-7833,7835 via svnmerge from trunk. Modified GeoWhereNode accordingly for changes in r7835.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7767 to /django/trunk:1-7835

  • django/branches/gis/django/middleware/http.py

    r6672 r7836  
    2020                # automatically removes content for this status code (in 
    2121                # http.conditional_content_removal()). 
    22                 response.status = 304 
     22                response.status_code = 304 
    2323 
    2424        if response.has_header('Last-Modified'): 
    …… 
    2727                # Setting the status code is enough here (same reasons as 
    2828                # above). 
    29                 response.status = 304 
     29                response.status_code = 304 
    3030 
    3131        return response