git Service des IN-Ulm e.V. Erkunden Hilfe
Anmelden
cbiedl
/
http-parser
1
0
Fork 0
Dateien
Struktur: 69fec7ae1c
Branches Tags
http-parser
/
debian
/
patches
/
cherry-pick.v2.9.4-7-g4b99e42.test-content-length-header-parsing.patch

cherry-pick.v2.9.4-7-g4b99e42.test-content-length-header-parsing.patch 17 KB
Verlauf Originalformat

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654 
  1. Subject: Test Content-Length header parsing
    2. 

  2. Origin: v2.9.4-7-g4b99e42 <https://github.com/joyent/http-parser/commit/4b99e42>
    3. 

  3. Upstream-Author: Ben Noordhuis <info@bnoordhuis.nl>
    4. 

  4. Date: Wed Jul 8 02:30:29 2020 +0200
    5. 

  5. 

  6.     The test suite did very little validation of the Content-Length field
    7. 

  7.     until now. Verify for each request and response that the parsed numeric
    8. 

  8.     value matches the value from the header field.
    9. 

  9. 

  10.     PR-URL: https://github.com/nodejs/http-parser/pull/519
    11. 

  11.     Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
    12. 

  12. 

  13. --- a/test.c
    14. 

  14. +++ b/test.c
    15. 

  15. @@ -74,6 +74,7 @@
    16. 

  16.  
    17. 

  17.    unsigned short http_major;
    18. 

  18.    unsigned short http_minor;
    19. 

  19. +  uint64_t content_length;
    20. 

  20.  
    21. 

  21.    int message_begin_cb_called;
    22. 

  22.    int headers_complete_cb_called;
    23. 

  23. @@ -108,6 +109,7 @@
    24. 

  24.    ,.fragment= ""
    25. 

  25.    ,.request_path= "/test"
    26. 

  26.    ,.request_url= "/test"
    27. 

  27. +  ,.content_length= -1
    28. 

  28.    ,.num_headers= 3
    29. 

  29.    ,.headers=
    30. 

  30.      { { "User-Agent", "curl/7.18.0 (i486-pc-linux-gnu) libcurl/7.18.0 OpenSSL/0.9.8g zlib/1.2.3.3 libidn/1.1" }
    31. 

  31. @@ -139,6 +141,7 @@
    32. 

  32.    ,.fragment= ""
    33. 

  33.    ,.request_path= "/favicon.ico"
    34. 

  34.    ,.request_url= "/favicon.ico"
    35. 

  35. +  ,.content_length= -1
    36. 

  36.    ,.num_headers= 8
    37. 

  37.    ,.headers=
    38. 

  38.      { { "Host", "0.0.0.0=5000" }
    39. 

  39. @@ -168,6 +171,7 @@
    40. 

  40.    ,.fragment= ""
    41. 

  41.    ,.request_path= "/dumbluck"
    42. 

  42.    ,.request_url= "/dumbluck"
    43. 

  43. +  ,.content_length= -1
    44. 

  44.    ,.num_headers= 1
    45. 

  45.    ,.headers=
    46. 

  46.      { { "aaaaaaaaaaaaa",  "++++++++++" }
    47. 

  47. @@ -190,6 +194,7 @@
    48. 

  48.    ,.request_path= "/forums/1/topics/2375"
    49. 

  49.    /* XXX request url does include fragment? */
    50. 

  50.    ,.request_url= "/forums/1/topics/2375?page=1#posts-17408"
    51. 

  51. +  ,.content_length= -1
    52. 

  52.    ,.num_headers= 0
    53. 

  53.    ,.body= ""
    54. 

  54.    }
    55. 

  55. @@ -208,6 +213,7 @@
    56. 

  56.    ,.fragment= ""
    57. 

  57.    ,.request_path= "/get_no_headers_no_body/world"
    58. 

  58.    ,.request_url= "/get_no_headers_no_body/world"
    59. 

  59. +  ,.content_length= -1
    60. 

  60.    ,.num_headers= 0
    61. 

  61.    ,.body= ""
    62. 

  62.    }
    63. 

  63. @@ -227,6 +233,7 @@
    64. 

  64.    ,.fragment= ""
    65. 

  65.    ,.request_path= "/get_one_header_no_body"
    66. 

  66.    ,.request_url= "/get_one_header_no_body"
    67. 

  67. +  ,.content_length= -1
    68. 

  68.    ,.num_headers= 1
    69. 

  69.    ,.headers=
    70. 

  70.      { { "Accept" , "*/*" }
    71. 

  71. @@ -250,6 +257,7 @@
    72. 

  72.    ,.fragment= ""
    73. 

  73.    ,.request_path= "/get_funky_content_length_body_hello"
    74. 

  74.    ,.request_url= "/get_funky_content_length_body_hello"
    75. 

  75. +  ,.content_length= 5
    76. 

  76.    ,.num_headers= 1
    77. 

  77.    ,.headers=
    78. 

  78.      { { "conTENT-Length" , "5" }
    79. 

  79. @@ -274,6 +282,7 @@
    80. 

  80.    ,.fragment= "hey"
    81. 

  81.    ,.request_path= "/post_identity_body_world"
    82. 

  82.    ,.request_url= "/post_identity_body_world?q=search#hey"
    83. 

  83. +  ,.content_length= 5
    84. 

  84.    ,.num_headers= 2
    85. 

  85.    ,.headers=
    86. 

  86.      { { "Accept", "*/*" }
    87. 

  87. @@ -300,6 +309,7 @@
    88. 

  88.    ,.fragment= ""
    89. 

  89.    ,.request_path= "/post_chunked_all_your_base"
    90. 

  90.    ,.request_url= "/post_chunked_all_your_base"
    91. 

  91. +  ,.content_length= -1
    92. 

  92.    ,.num_headers= 1
    93. 

  93.    ,.headers=
    94. 

  94.      { { "Transfer-Encoding" , "chunked" }
    95. 

  95. @@ -328,6 +338,7 @@
    96. 

  96.    ,.fragment= ""
    97. 

  97.    ,.request_path= "/two_chunks_mult_zero_end"
    98. 

  98.    ,.request_url= "/two_chunks_mult_zero_end"
    99. 

  99. +  ,.content_length= -1
    100. 

  100.    ,.num_headers= 1
    101. 

  101.    ,.headers=
    102. 

  102.      { { "Transfer-Encoding", "chunked" }
    103. 

  103. @@ -358,6 +369,7 @@
    104. 

  104.    ,.fragment= ""
    105. 

  105.    ,.request_path= "/chunked_w_trailing_headers"
    106. 

  106.    ,.request_url= "/chunked_w_trailing_headers"
    107. 

  107. +  ,.content_length= -1
    108. 

  108.    ,.num_headers= 3
    109. 

  109.    ,.headers=
    110. 

  110.      { { "Transfer-Encoding",  "chunked" }
    111. 

  111. @@ -388,6 +400,7 @@
    112. 

  112.    ,.fragment= ""
    113. 

  113.    ,.request_path= "/chunked_w_nonsense_after_length"
    114. 

  114.    ,.request_url= "/chunked_w_nonsense_after_length"
    115. 

  115. +  ,.content_length= -1
    116. 

  116.    ,.num_headers= 1
    117. 

  117.    ,.headers=
    118. 

  118.      { { "Transfer-Encoding", "chunked" }
    119. 

  119. @@ -410,6 +423,7 @@
    120. 

  120.    ,.fragment= ""
    121. 

  121.    ,.request_path= "/with_\"stupid\"_quotes"
    122. 

  122.    ,.request_url= "/with_\"stupid\"_quotes?foo=\"bar\""
    123. 

  123. +  ,.content_length= -1
    124. 

  124.    ,.num_headers= 0
    125. 

  125.    ,.headers= { }
    126. 

  126.    ,.body= ""
    127. 

  127. @@ -436,6 +450,7 @@
    128. 

  128.    ,.fragment= ""
    129. 

  129.    ,.request_path= "/test"
    130. 

  130.    ,.request_url= "/test"
    131. 

  131. +  ,.content_length= -1
    132. 

  132.    ,.num_headers= 3
    133. 

  133.    ,.headers= { { "Host", "0.0.0.0:5000" }
    134. 

  134.               , { "User-Agent", "ApacheBench/2.3" }
    135. 

  135. @@ -459,6 +474,7 @@
    136. 

  136.    ,.fragment= ""
    137. 

  137.    ,.request_path= "/test.cgi"
    138. 

  138.    ,.request_url= "/test.cgi?foo=bar?baz"
    139. 

  139. +  ,.content_length= -1
    140. 

  140.    ,.num_headers= 0
    141. 

  141.    ,.headers= {}
    142. 

  142.    ,.body= ""
    143. 

  143. @@ -480,6 +496,7 @@
    144. 

  144.    ,.fragment= ""
    145. 

  145.    ,.request_path= "/test"
    146. 

  146.    ,.request_url= "/test"
    147. 

  147. +  ,.content_length= -1
    148. 

  148.    ,.num_headers= 0
    149. 

  149.    ,.headers= { }
    150. 

  150.    ,.body= ""
    151. 

  151. @@ -507,6 +524,7 @@
    152. 

  152.    ,.fragment= ""
    153. 

  153.    ,.request_path= "/demo"
    154. 

  154.    ,.request_url= "/demo"
    155. 

  155. +  ,.content_length= -1
    156. 

  156.    ,.num_headers= 7
    157. 

  157.    ,.upgrade="Hot diggity dogg"
    158. 

  158.    ,.headers= { { "Host", "example.com" }
    159. 

  159. @@ -538,6 +556,7 @@
    160. 

  160.    ,.fragment= ""
    161. 

  161.    ,.request_path= ""
    162. 

  162.    ,.request_url= "0-home0.netscape.com:443"
    163. 

  163. +  ,.content_length= -1
    164. 

  164.    ,.num_headers= 2
    165. 

  165.    ,.upgrade="some data\r\nand yet even more data"
    166. 

  166.    ,.headers= { { "User-agent", "Mozilla/1.1N" }
    167. 

  167. @@ -560,6 +579,7 @@
    168. 

  168.    ,.fragment= ""
    169. 

  169.    ,.request_path= "/test"
    170. 

  170.    ,.request_url= "/test"
    171. 

  171. +  ,.content_length= -1
    172. 

  172.    ,.num_headers= 0
    173. 

  173.    ,.headers= {}
    174. 

  174.    ,.body= ""
    175. 

  175. @@ -579,6 +599,7 @@
    176. 

  176.    ,.fragment= ""
    177. 

  177.    ,.request_path= "/"
    178. 

  178.    ,.request_url= "/"
    179. 

  179. +  ,.content_length= -1
    180. 

  180.    ,.num_headers= 0
    181. 

  181.    ,.headers= {}
    182. 

  182.    ,.body= ""
    183. 

  183. @@ -601,6 +622,7 @@
    184. 

  184.    ,.fragment= ""
    185. 

  185.    ,.request_path= "*"
    186. 

  186.    ,.request_url= "*"
    187. 

  187. +  ,.content_length= -1
    188. 

  188.    ,.num_headers= 3
    189. 

  189.    ,.headers= { { "HOST", "239.255.255.250:1900" }
    190. 

  190.               , { "MAN", "\"ssdp:discover\"" }
    191. 

  191. @@ -636,6 +658,7 @@
    192. 

  192.    ,.fragment= ""
    193. 

  193.    ,.request_path= "/"
    194. 

  194.    ,.request_url= "/"
    195. 

  195. +  ,.content_length= -1
    196. 

  196.    ,.num_headers= 5
    197. 

  197.    ,.headers= { { "Line1", "abc\tdef ghi\t\tjkl  mno \t \tqrs" }
    198. 

  198.               , { "Line2", "line2\t" }
    199. 

  199. @@ -662,6 +685,7 @@
    200. 

  200.    ,.request_path= ""
    201. 

  201.    ,.request_url= "http://hypnotoad.org?hail=all"
    202. 

  202.    ,.host= "hypnotoad.org"
    203. 

  203. +  ,.content_length= -1
    204. 

  204.    ,.num_headers= 0
    205. 

  205.    ,.headers= { }
    206. 

  206.    ,.body= ""
    207. 

  207. @@ -683,6 +707,7 @@
    208. 

  208.    ,.request_url= "http://hypnotoad.org:1234?hail=all"
    209. 

  209.    ,.host= "hypnotoad.org"
    210. 

  210.    ,.port= 1234
    211. 

  211. +  ,.content_length= -1
    212. 

  212.    ,.num_headers= 0
    213. 

  213.    ,.headers= { }
    214. 

  214.    ,.body= ""
    215. 

  215. @@ -704,6 +729,7 @@
    216. 

  216.    ,.request_url= "http://hypnotoad.org:1234"
    217. 

  217.    ,.host= "hypnotoad.org"
    218. 

  218.    ,.port= 1234
    219. 

  219. +  ,.content_length= -1
    220. 

  220.    ,.num_headers= 0
    221. 

  221.    ,.headers= { }
    222. 

  222.    ,.body= ""
    223. 

  223. @@ -728,6 +754,7 @@
    224. 

  224.    ,.fragment= ""
    225. 

  225.    ,.request_path= "/file.txt"
    226. 

  226.    ,.request_url= "/file.txt"
    227. 

  227. +  ,.content_length= 10
    228. 

  228.    ,.num_headers= 4
    229. 

  229.    ,.headers= { { "Host", "www.example.com" }
    230. 

  230.               , { "Content-Type", "application/example" }
    231. 

  231. @@ -753,6 +780,7 @@
    232. 

  232.    ,.fragment= ""
    233. 

  233.    ,.request_path= ""
    234. 

  234.    ,.request_url= "HOME0.NETSCAPE.COM:443"
    235. 

  235. +  ,.content_length= -1
    236. 

  236.    ,.num_headers= 2
    237. 

  237.    ,.upgrade=""
    238. 

  238.    ,.headers= { { "User-agent", "Mozilla/1.1N" }
    239. 

  239. @@ -777,6 +805,7 @@
    240. 

  240.    ,.fragment= "narf"
    241. 

  241.    ,.request_path= "/δ¶/δt/pope"
    242. 

  242.    ,.request_url= "/δ¶/δt/pope?q=1#narf"
    243. 

  243. +  ,.content_length= -1
    244. 

  244.    ,.num_headers= 1
    245. 

  245.    ,.headers= { {"Host", "github.com" }
    246. 

  246.               }
    247. 

  247. @@ -799,6 +828,7 @@
    248. 

  248.    ,.fragment= ""
    249. 

  249.    ,.request_path= ""
    250. 

  250.    ,.request_url= "home_0.netscape.com:443"
    251. 

  251. +  ,.content_length= -1
    252. 

  252.    ,.num_headers= 2
    253. 

  253.    ,.upgrade=""
    254. 

  254.    ,.headers= { { "User-agent", "Mozilla/1.1N" }
    255. 

  255. @@ -826,6 +856,7 @@
    256. 

  256.    ,.fragment= ""
    257. 

  257.    ,.request_path= "/"
    258. 

  258.    ,.request_url= "/"
    259. 

  259. +  ,.content_length= 4
    260. 

  260.    ,.num_headers= 3
    261. 

  261.    ,.upgrade= 0
    262. 

  262.    ,.headers= { { "Host", "www.example.com" }
    263. 

  263. @@ -854,6 +885,7 @@
    264. 

  264.    ,.fragment= ""
    265. 

  265.    ,.request_path= "/"
    266. 

  266.    ,.request_url= "/"
    267. 

  267. +  ,.content_length= 4
    268. 

  268.    ,.num_headers= 4
    269. 

  269.    ,.upgrade= 0
    270. 

  270.    ,.headers= { { "Host", "www.example.com" }
    271. 

  271. @@ -879,6 +911,7 @@
    272. 

  272.    ,.fragment= ""
    273. 

  273.    ,.request_path= "/file.txt"
    274. 

  274.    ,.request_url= "/file.txt"
    275. 

  275. +  ,.content_length= -1
    276. 

  276.    ,.num_headers= 1
    277. 

  277.    ,.headers= { { "Host", "www.example.com" } }
    278. 

  278.    ,.body= ""
    279. 

  279. @@ -899,6 +932,7 @@
    280. 

  280.    ,.fragment= ""
    281. 

  281.    ,.request_path= "/"
    282. 

  282.    ,.request_url= "/"
    283. 

  283. +  ,.content_length= -1
    284. 

  284.    ,.num_headers= 1
    285. 

  285.    ,.headers= { { "Host", "www.example.com" } }
    286. 

  286.    ,.body= ""
    287. 

  287. @@ -920,6 +954,7 @@
    288. 

  288.    ,.host= "hypnotoad.org"
    289. 

  289.    ,.userinfo= "a%12:b!&*$"
    290. 

  290.    ,.port= 1234
    291. 

  291. +  ,.content_length= -1
    292. 

  292.    ,.num_headers= 0
    293. 

  293.    ,.headers= { }
    294. 

  294.    ,.body= ""
    295. 

  295. @@ -952,6 +987,7 @@
    296. 

  296.    ,.fragment= ""
    297. 

  297.    ,.request_path= "/"
    298. 

  298.    ,.request_url= "/"
    299. 

  299. +  ,.content_length= -1
    300. 

  300.    ,.num_headers= 5
    301. 

  301.    ,.headers= { { "Line1", "abc\tdef ghi\t\tjkl  mno \t \tqrs" }
    302. 

  302.               , { "Line2", "line2\t" }
    303. 

  303. @@ -985,6 +1021,7 @@
    304. 

  304.    ,.fragment= ""
    305. 

  305.    ,.request_path= "/demo"
    306. 

  306.    ,.request_url= "/demo"
    307. 

  307. +  ,.content_length= -1
    308. 

  308.    ,.num_headers= 7
    309. 

  309.    ,.upgrade="Hot diggity dogg"
    310. 

  310.    ,.headers= { { "Host", "example.com" }
    311. 

  311. @@ -1015,6 +1052,7 @@
    312. 

  312.    ,.fragment= ""
    313. 

  313.    ,.request_path= "/demo"
    314. 

  314.    ,.request_url= "/demo"
    315. 

  315. +  ,.content_length= -1
    316. 

  316.    ,.num_headers= 2
    317. 

  317.    ,.upgrade="Hot diggity dogg"
    318. 

  318.    ,.headers= { { "Connection", "keep-alive, upgrade" }
    319. 

  319. @@ -1040,6 +1078,7 @@
    320. 

  320.    ,.fragment= ""
    321. 

  321.    ,.request_path= "/demo"
    322. 

  322.    ,.request_url= "/demo"
    323. 

  323. +  ,.content_length= -1
    324. 

  324.    ,.num_headers= 2
    325. 

  325.    ,.upgrade="Hot diggity dogg"
    326. 

  326.    ,.headers= { { "Connection", "keep-alive,  upgrade" }
    327. 

  327. @@ -1066,6 +1105,7 @@
    328. 

  328.    ,.method= HTTP_POST
    329. 

  329.    ,.request_path= "/demo"
    330. 

  330.    ,.request_url= "/demo"
    331. 

  331. +  ,.content_length= 15
    332. 

  332.    ,.num_headers= 4
    333. 

  333.    ,.upgrade="Hot diggity dogg"
    334. 

  334.    ,.headers= { { "Host", "example.com" }
    335. 

  335. @@ -1091,6 +1131,7 @@
    336. 

  336.    ,.http_minor= 0
    337. 

  337.    ,.method= HTTP_CONNECT
    338. 

  338.    ,.request_url= "foo.bar.com:443"
    339. 

  339. +  ,.content_length= 10
    340. 

  340.    ,.num_headers= 3
    341. 

  341.    ,.upgrade="blarfcicle"
    342. 

  342.    ,.headers= { { "User-agent", "Mozilla/1.1N" }
    343. 

  343. @@ -1121,6 +1162,7 @@
    344. 

  344.    ,.request_url= "/images/my_dog.jpg"
    345. 

  345.    ,.query_string= ""
    346. 

  346.    ,.fragment= ""
    347. 

  347. +  ,.content_length= -1
    348. 

  348.    ,.num_headers= 3
    349. 

  349.    ,.headers= { { "Host", "example.com" }
    350. 

  350.               , { "Link", "<http://example.com/profiles/joe>; rel=\"tag\"" }
    351. 

  351. @@ -1145,6 +1187,7 @@
    352. 

  352.    ,.request_url= "/images/my_dog.jpg"
    353. 

  353.    ,.query_string= ""
    354. 

  354.    ,.fragment= ""
    355. 

  355. +  ,.content_length= -1
    356. 

  356.    ,.num_headers= 2
    357. 

  357.    ,.headers= { { "Host", "example.com" }
    358. 

  358.  	     , { "Link", "<http://example.com/profiles/sally>; rel=\"tag\"" }
    359. 

  359. @@ -1167,6 +1210,7 @@
    360. 

  360.    ,.request_url= "/music/sweet/music"
    361. 

  361.    ,.query_string= ""
    362. 

  362.    ,.fragment= ""
    363. 

  363. +  ,.content_length= -1
    364. 

  364.    ,.num_headers= 1
    365. 

  365.    ,.headers= { { "Host", "example.com" } }
    366. 

  366.    ,.body= ""
    367. 

  367. @@ -1187,6 +1231,7 @@
    368. 

  368.    ,.request_url= "/music/sweet/music"
    369. 

  369.    ,.query_string= ""
    370. 

  370.    ,.fragment= ""
    371. 

  371. +  ,.content_length= -1
    372. 

  372.    ,.num_headers= 1
    373. 

  373.    ,.headers= { { "Host", "example.com" } }
    374. 

  374.    ,.body= ""
    375. 

  375. @@ -1210,6 +1255,7 @@
    376. 

  376.    ,.fragment= ""
    377. 

  377.    ,.request_path= "/"
    378. 

  378.    ,.request_url= "/"
    379. 

  379. +  ,.content_length= -1
    380. 

  380.    ,.num_headers= 1
    381. 

  381.    ,.headers=
    382. 

  382.      { { "Transfer-Encoding" , "deflate, chunked" }
    383. 

  383. @@ -1238,6 +1284,7 @@
    384. 

  384.    ,.fragment= ""
    385. 

  385.    ,.request_path= "/"
    386. 

  386.    ,.request_url= "/"
    387. 

  387. +  ,.content_length= -1
    388. 

  388.    ,.num_headers= 1
    389. 

  389.    ,.headers=
    390. 

  390.      { { "Transfer-Encoding" , "deflate, chunked" }
    391. 

  391. @@ -1275,6 +1322,7 @@
    392. 

  392.    ,.http_minor= 1
    393. 

  393.    ,.status_code= 301
    394. 

  394.    ,.response_status= "Moved Permanently"
    395. 

  395. +  ,.content_length= 219
    396. 

  396.    ,.num_headers= 8
    397. 

  397.    ,.headers=
    398. 

  398.      { { "Location", "http://www.google.com/" }
    399. 

  399. @@ -1324,6 +1372,7 @@
    400. 

  400.    ,.http_minor= 1
    401. 

  401.    ,.status_code= 200
    402. 

  402.    ,.response_status= "OK"
    403. 

  403. +  ,.content_length= -1
    404. 

  404.    ,.num_headers= 5
    405. 

  405.    ,.headers=
    406. 

  406.      { { "Date", "Tue, 04 Aug 2009 07:59:32 GMT" }
    407. 

  407. @@ -1353,6 +1402,7 @@
    408. 

  408.    ,.http_minor= 1
    409. 

  409.    ,.status_code= 404
    410. 

  410.    ,.response_status= "Not Found"
    411. 

  411. +  ,.content_length= -1
    412. 

  412.    ,.num_headers= 0
    413. 

  413.    ,.headers= {}
    414. 

  414.    ,.body_size= 0
    415. 

  415. @@ -1368,6 +1418,7 @@
    416. 

  416.    ,.http_major= 1
    417. 

  417.    ,.http_minor= 1
    418. 

  418.    ,.status_code= 301
    419. 

  419. +  ,.content_length= -1
    420. 

  420.    ,.response_status= ""
    421. 

  421.    ,.num_headers= 0
    422. 

  422.    ,.headers= {}
    423. 

  423. @@ -1395,6 +1446,7 @@
    424. 

  424.    ,.http_minor= 1
    425. 

  425.    ,.status_code= 200
    426. 

  426.    ,.response_status= "OK"
    427. 

  427. +  ,.content_length= -1
    428. 

  428.    ,.num_headers= 2
    429. 

  429.    ,.headers=
    430. 

  430.      { {"Content-Type", "text/plain" }
    431. 

  431. @@ -1422,6 +1474,7 @@
    432. 

  432.    ,.http_minor= 1
    433. 

  433.    ,.status_code= 200
    434. 

  434.    ,.response_status= "OK"
    435. 

  435. +  ,.content_length= -1
    436. 

  436.    ,.num_headers= 2
    437. 

  437.    ,.headers=
    438. 

  438.      { {"Content-Type", "text/html; charset=utf-8" }
    439. 

  439. @@ -1446,6 +1499,7 @@
    440. 

  440.    ,.http_minor= 1
    441. 

  441.    ,.status_code= 200
    442. 

  442.    ,.response_status= "OK"
    443. 

  443. +  ,.content_length= 11
    444. 

  444.    ,.num_headers= 4
    445. 

  445.    ,.headers=
    446. 

  446.      { {"Content-Type", "text/html; charset=UTF-8" }
    447. 

  447. @@ -1472,6 +1526,7 @@
    448. 

  448.    ,.http_minor= 1
    449. 

  449.    ,.status_code= 200
    450. 

  450.    ,.response_status= "OK"
    451. 

  451. +  ,.content_length= 0
    452. 

  452.    ,.num_headers= 4
    453. 

  453.    ,.headers=
    454. 

  454.      { {"Server", "DCLK-AdSvr" }
    455. 

  455. @@ -1505,6 +1560,7 @@
    456. 

  456.    ,.http_minor= 0
    457. 

  457.    ,.status_code= 301
    458. 

  458.    ,.response_status= "Moved Permanently"
    459. 

  459. +  ,.content_length= 0
    460. 

  460.    ,.num_headers= 9
    461. 

  461.    ,.headers=
    462. 

  462.      { { "Date", "Thu, 03 Jun 2010 09:56:32 GMT" }
    463. 

  463. @@ -1544,6 +1600,7 @@
    464. 

  464.    ,.http_minor= 1
    465. 

  465.    ,.status_code= 200
    466. 

  466.    ,.response_status= "OK"
    467. 

  467. +  ,.content_length= -1
    468. 

  468.    ,.num_headers= 11
    469. 

  469.    ,.headers=
    470. 

  470.      { { "Date", "Tue, 28 Sep 2010 01:14:13 GMT" }
    471. 

  471. @@ -1578,6 +1635,7 @@
    472. 

  472.    ,.http_minor= 1
    473. 

  473.    ,.status_code= 500
    474. 

  474.    ,.response_status= "Oriëntatieprobleem"
    475. 

  475. +  ,.content_length= 0
    476. 

  476.    ,.num_headers= 3
    477. 

  477.    ,.headers=
    478. 

  478.      { { "Date", "Fri, 5 Nov 2010 23:07:12 GMT+2" }
    479. 

  479. @@ -1599,6 +1657,7 @@
    480. 

  480.    ,.http_minor= 9
    481. 

  481.    ,.status_code= 200
    482. 

  482.    ,.response_status= "OK"
    483. 

  483. +  ,.content_length= -1
    484. 

  484.    ,.num_headers= 0
    485. 

  485.    ,.headers=
    486. 

  486.      {}
    487. 

  487. @@ -1622,6 +1681,7 @@
    488. 

  488.    ,.http_minor= 1
    489. 

  489.    ,.status_code= 200
    490. 

  490.    ,.response_status= "OK"
    491. 

  491. +  ,.content_length= -1
    492. 

  492.    ,.num_headers= 1
    493. 

  493.    ,.headers=
    494. 

  494.      { { "Content-Type", "text/plain" }
    495. 

  495. @@ -1641,6 +1701,7 @@
    496. 

  496.    ,.http_minor= 0
    497. 

  497.    ,.status_code= 200
    498. 

  498.    ,.response_status= "OK"
    499. 

  499. +  ,.content_length= -1
    500. 

  500.    ,.num_headers= 1
    501. 

  501.    ,.headers=
    502. 

  502.      { { "Connection", "keep-alive" }
    503. 

  503. @@ -1661,6 +1722,7 @@
    504. 

  504.    ,.http_minor= 0
    505. 

  505.    ,.status_code= 204
    506. 

  506.    ,.response_status= "No content"
    507. 

  507. +  ,.content_length= -1
    508. 

  508.    ,.num_headers= 1
    509. 

  509.    ,.headers=
    510. 

  510.      { { "Connection", "keep-alive" }
    511. 

  511. @@ -1680,6 +1742,7 @@
    512. 

  512.    ,.http_minor= 1
    513. 

  513.    ,.status_code= 200
    514. 

  514.    ,.response_status= "OK"
    515. 

  515. +  ,.content_length= -1
    516. 

  516.    ,.num_headers= 0
    517. 

  517.    ,.headers={}
    518. 

  518.    ,.body_size= 0
    519. 

  519. @@ -1697,6 +1760,7 @@
    520. 

  520.    ,.http_minor= 1
    521. 

  521.    ,.status_code= 204
    522. 

  522.    ,.response_status= "No content"
    523. 

  523. +  ,.content_length= -1
    524. 

  524.    ,.num_headers= 0
    525. 

  525.    ,.headers={}
    526. 

  526.    ,.body_size= 0
    527. 

  527. @@ -1715,6 +1779,7 @@
    528. 

  528.    ,.http_minor= 1
    529. 

  529.    ,.status_code= 204
    530. 

  530.    ,.response_status= "No content"
    531. 

  531. +  ,.content_length= -1
    532. 

  532.    ,.num_headers= 1
    533. 

  533.    ,.headers=
    534. 

  534.      { { "Connection", "close" }
    535. 

  535. @@ -1737,6 +1802,7 @@
    536. 

  536.    ,.http_minor= 1
    537. 

  537.    ,.status_code= 200
    538. 

  538.    ,.response_status= "OK"
    539. 

  539. +  ,.content_length= -1
    540. 

  540.    ,.num_headers= 1
    541. 

  541.    ,.headers=
    542. 

  542.      { { "Transfer-Encoding", "chunked" }
    543. 

  543. @@ -1767,6 +1833,7 @@
    544. 

  544.    ,.http_minor= 1
    545. 

  545.    ,.status_code= 200
    546. 

  546.    ,.response_status= "OK"
    547. 

  547. +  ,.content_length= 16
    548. 

  548.    ,.num_headers= 7
    549. 

  549.    ,.headers=
    550. 

  550.      { { "Server",  "Microsoft-IIS/6.0" }
    551. 

  551. @@ -1805,6 +1872,7 @@
    552. 

  552.    ,.http_minor= 1
    553. 

  553.    ,.status_code= 301
    554. 

  554.    ,.response_status= "MovedPermanently"
    555. 

  555. +  ,.content_length= -1
    556. 

  556.    ,.num_headers= 9
    557. 

  557.    ,.headers= { { "Date", "Wed, 15 May 2013 17:06:33 GMT" }
    558. 

  558.               , { "Server", "Server" }
    559. 

  559. @@ -1832,6 +1900,7 @@
    560. 

  560.    ,.http_minor= 1
    561. 

  561.    ,.status_code= 200
    562. 

  562.    ,.response_status= ""
    563. 

  563. +  ,.content_length= -1
    564. 

  564.    ,.num_headers= 0
    565. 

  565.    ,.headers= {}
    566. 

  566.    ,.body= ""
    567. 

  567. @@ -1854,6 +1923,7 @@
    568. 

  568.    ,.http_minor= 1
    569. 

  569.    ,.status_code= 200
    570. 

  570.    ,.response_status= "OK"
    571. 

  571. +  ,.content_length= -1
    572. 

  572.    ,.num_headers= 2
    573. 

  573.    ,.headers= { { "Content-Length-X", "0" }
    574. 

  574.               , { "Transfer-Encoding", "chunked" }
    575. 

  575. @@ -1878,6 +1948,7 @@
    576. 

  576.    ,.status_code= 101
    577. 

  577.    ,.response_status= "Switching Protocols"
    578. 

  578.    ,.upgrade= "proto"
    579. 

  579. +  ,.content_length= -1
    580. 

  580.    ,.num_headers= 2
    581. 

  581.    ,.headers=
    582. 

  582.      { { "Connection", "upgrade" }
    583. 

  583. @@ -1903,6 +1974,7 @@
    584. 

  584.    ,.response_status= "Switching Protocols"
    585. 

  585.    ,.body= "body"
    586. 

  586.    ,.upgrade= "proto"
    587. 

  587. +  ,.content_length= 4
    588. 

  588.    ,.num_headers= 3
    589. 

  589.    ,.headers=
    590. 

  590.      { { "Connection", "upgrade" }
    591. 

  591. @@ -1934,6 +2006,7 @@
    592. 

  592.    ,.response_status= "Switching Protocols"
    593. 

  593.    ,.body= "body"
    594. 

  594.    ,.upgrade= "proto"
    595. 

  595. +  ,.content_length= -1
    596. 

  596.    ,.num_headers= 3
    597. 

  597.    ,.headers=
    598. 

  598.      { { "Connection", "upgrade" }
    599. 

  599. @@ -1960,6 +2033,7 @@
    600. 

  600.    ,.response_status= "OK"
    601. 

  601.    ,.body= "body"
    602. 

  602.    ,.upgrade= NULL
    603. 

  603. +  ,.content_length= -1
    604. 

  604.    ,.num_headers= 2
    605. 

  605.    ,.headers=
    606. 

  606.      { { "Connection", "upgrade" }
    607. 

  607. @@ -1982,6 +2056,7 @@
    608. 

  608.    ,.http_minor= 1
    609. 

  609.    ,.status_code= 200
    610. 

  610.    ,.response_status= "OK"
    611. 

  611. +  ,.content_length= 4
    612. 

  612.    ,.num_headers= 3
    613. 

  613.    ,.body= "body"
    614. 

  614.    ,.upgrade= NULL
    615. 

  615. @@ -2012,6 +2087,7 @@
    616. 

  616.    ,.http_minor= 1
    617. 

  617.    ,.status_code= 200
    618. 

  618.    ,.response_status= "OK"
    619. 

  619. +  ,.content_length= -1
    620. 

  620.    ,.num_headers= 3
    621. 

  621.    ,.body= "body"
    622. 

  622.    ,.upgrade= NULL
    623. 

  623. @@ -2039,6 +2115,7 @@
    624. 

  624.    ,.http_minor= 1
    625. 

  625.    ,.status_code= 200
    626. 

  626.    ,.response_status= "OK"
    627. 

  627. +  ,.content_length= -1
    628. 

  628.    ,.num_headers= 1
    629. 

  629.    ,.headers= { { "Transfer-Encoding", "chunked, identity" }
    630. 

  630.               }
    631. 

  631. @@ -2202,6 +2279,7 @@
    632. 

  632.    messages[num_messages].status_code = parser.status_code;
    633. 

  633.    messages[num_messages].http_major = parser.http_major;
    634. 

  634.    messages[num_messages].http_minor = parser.http_minor;
    635. 

  635. +  messages[num_messages].content_length = parser.content_length;
    636. 

  636.    messages[num_messages].headers_complete_cb_called = TRUE;
    637. 

  637.    messages[num_messages].should_keep_alive = http_should_keep_alive(&parser);
    638. 

  638.    return 0;
    639. 

  639. @@ -2650,6 +2728,7 @@
    640. 

  640.  
    641. 

  641.    MESSAGE_CHECK_NUM_EQ(expected, m, http_major);
    642. 

  642.    MESSAGE_CHECK_NUM_EQ(expected, m, http_minor);
    643. 

  643. +  MESSAGE_CHECK_NUM_EQ(expected, m, content_length);
    644. 

  644.  
    645. 

  645.    if (expected->type == HTTP_REQUEST) {
    646. 

  646.      MESSAGE_CHECK_NUM_EQ(expected, m, method);
    647. 

  647. @@ -4351,6 +4430,7 @@
    648. 

  648.        ,.http_minor= 0
    649. 

  649.        ,.status_code= 200
    650. 

  650.        ,.response_status= "OK"
    651. 

  651. +      ,.content_length= -1
    652. 

  652.        ,.num_headers= 2
    653. 

  653.        ,.headers=
    654. 

  654.          { { "Transfer-Encoding", "chunked" }
    655.