Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

[1.2.X] Fixed #14468 -- Extended the list of content types that the t…

…est client could guess when handling zip files. Thanks, Russ and emulbreh.

Backport from trunk (r15236).

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent b9db129 commit b305cc33c5827ac8daecbf7395fbccb196f92d47 @jezdez jezdez committed
Showing with 4 additions and 2 deletions.
  1. +4 −2 tests/regressiontests/test_client_regress/
6 tests/regressiontests/test_client_regress/
@@ -844,8 +844,10 @@ def test_guesses_content_type_on_file_encoding(self):
encode_file('IGNORE', 'IGNORE', DummyFile("file.bin"))[2])
self.assertEqual('Content-Type: text/plain',
encode_file('IGNORE', 'IGNORE', DummyFile("file.txt"))[2])
- self.assertEqual('Content-Type: application/zip',
- encode_file('IGNORE', 'IGNORE', DummyFile(""))[2])
+ self.assertIn(encode_file('IGNORE', 'IGNORE', DummyFile(""))[2], (
+ 'Content-Type: application/x-compress',
+ 'Content-Type: application/x-zip',
+ 'Content-Type: application/x-zip-compressed'))
self.assertEqual('Content-Type: application/octet-stream',
encode_file('IGNORE', 'IGNORE', DummyFile("file.unknown"))[2])

0 comments on commit b305cc3

Please sign in to comment.
Something went wrong with that request. Please try again.