Navigation

http.py

Timestamp:

06/30/08 10:38:16 (6 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7808]. Fixed #7519, #7573

Files:

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-7768 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-7808

r6761	r7809
20	20	# automatically removes content for this status code (in
21	21	# http.conditional_content_removal()).
22		response.status = 304
	22	response.status_code = 304
23	23
24	24	if response.has_header('Last-Modified'):
…	…
27	27	# Setting the status code is enough here (same reasons as
28	28	# above).
29		response.status = 304
	29	response.status_code = 304
30	30
31	31	return response