Skip to content

Commit c3f2c4b

Browse files
committed
Merge pull request #233 from kxepal/more-headers
Add more headers per RFC: 2616, 2518, 3230, 5988 and for event source
2 parents f55866e + 3106567 commit c3f2c4b

File tree

2 files changed

+37
-6
lines changed

2 files changed

+37
-6
lines changed

aiohttp/hdrs.py

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,59 @@
33

44

55
ACCEPT = upstr('ACCEPT')
6+
ACCEPT_CHARSET = upstr('ACCEPT-CHARSET')
67
ACCEPT_ENCODING = upstr('ACCEPT-ENCODING')
8+
ACCEPT_LANGUAGE = upstr('ACCEPT-LANGUAGE')
9+
AGE = upstr('AGE')
10+
ALLOW = upstr('ALLOW')
711
AUTHORIZATION = upstr('AUTHORIZATION')
12+
CACHE_CONTROL = upstr('CACHE-CONTROL')
813
CONNECTION = upstr('CONNECTION')
914
CONTENT_ENCODING = upstr('CONTENT-ENCODING')
15+
CONTENT_LANGUAGE = upstr('CONTENT-LANGUAGE')
1016
CONTENT_LENGTH = upstr('CONTENT-LENGTH')
11-
CONTENT_TYPE = upstr('CONTENT-TYPE')
17+
CONTENT_LOCATION = upstr('CONTENT-LOCATION')
18+
CONTENT_MD5 = upstr('CONTENT-MD5')
19+
CONTENT_RANGE = upstr('CONTENT-RANGE')
1220
CONTENT_TRANSFER_ENCODING = upstr('CONTENT-TRANSFER-ENCODING')
21+
CONTENT_TYPE = upstr('CONTENT-TYPE')
1322
COOKIE = upstr('COOKIE')
1423
DATE = upstr('DATE')
24+
DESTINATION = upstr('DESTINATION')
25+
DIGEST = upstr('DIGEST')
26+
ETAG = upstr('ETAG')
1527
EXPECT = upstr('EXPECT')
28+
EXPIRES = upstr('EXPIRES')
29+
FROM = upstr('FROM')
1630
HOST = upstr('HOST')
31+
IF_MATCH = upstr('IF-MATCH')
32+
IF_MODIFIED_SINCE = upstr('IF-MODIFIED-SINCE')
33+
IF_NONE_MATCH = upstr('IF-NONE-MATCH')
34+
IF_RANGE = upstr('IF-RANGE')
35+
IF_UNMODIFIED_SINCE = upstr('IF-UNMODIFIED-SINCE')
1736
KEEP_ALIVE = upstr('KEEP-ALIVE')
37+
LAST_EVENT_ID = upstr('LAST-EVENT-ID')
38+
LAST_MODIFIED = upstr('LAST-MODIFIED')
39+
LINK = upstr('LINK')
1840
LOCATION = upstr('LOCATION')
41+
MAX_FORWARDS = upstr('MAX-FORWARDS')
42+
PRAGMA = upstr('PRAGMA')
1943
PROXY_AUTHENTICATE = upstr('PROXY_AUTHENTICATE')
2044
PROXY_AUTHORIZATION = upstr('PROXY-AUTHORIZATION')
45+
RANGE = upstr('RANGE')
2146
REFERER = upstr('REFERER')
22-
SET_COOKIE = upstr('SET-COOKIE')
47+
RETRY_AFTER = upstr('RETRY-AFTER')
2348
SEC_WEBSOCKET_KEY1 = upstr('SEC-WEBSOCKET-KEY1')
2449
SERVER = upstr('SERVER')
50+
SET_COOKIE = upstr('SET-COOKIE')
2551
TE = upstr('TE')
26-
TRAILERS = upstr('TRAILERS')
52+
TRAILER = upstr('TRAILER')
2753
TRANSFER_ENCODING = upstr('TRANSFER-ENCODING')
28-
USER_AGENT = upstr('USER-AGENT')
29-
URI = upstr('URI')
3054
UPGRADE = upstr('UPGRADE')
55+
URI = upstr('URI')
56+
USER_AGENT = upstr('USER-AGENT')
57+
VARY = upstr('VARY')
58+
VIA = upstr('VIA')
59+
WANT_DIGEST = upstr('WANT-DIGEST')
60+
WARNING = upstr('WARNING')
61+
WWW_AUTHENTICATE = upstr('WWW-AUTHENTICATE')

aiohttp/protocol.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ class Response(HttpMessage):
801801
hdrs.PROXY_AUTHENTICATE,
802802
hdrs.PROXY_AUTHORIZATION,
803803
hdrs.TE,
804-
hdrs.TRAILERS,
804+
hdrs.TRAILER,
805805
hdrs.TRANSFER_ENCODING,
806806
hdrs.UPGRADE,
807807
}

0 commit comments

Comments
 (0)