CC: uhttpd: fix keep-alive bug (#20607, #20661)
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 7 Oct 2015 22:20:55 +0000 (22:20 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 7 Oct 2015 22:20:55 +0000 (22:20 +0000)
commitaf9ce72546ee8260fad503b6dd05761ba7a2345e
treec264ade383ec5ac0387790354d543a5fff845daf
parent3a5b8f93ecf30372271a42388c4075c41b1ec724
CC: uhttpd: fix keep-alive bug (#20607, #20661)
The two commits

  5162e3b0ee7bd1d0fd6e75e1ca7993a1834b5291
"allow request handlers to disable chunked reponses"

and

  618493e378e2239f0d30902e47adfa134e649fdc
"file: disable chunked encoding for file responses"

broke the chunked transfer encoding handling for proc responses in keep-alive
connections that followed a file response with http status 204 or 304.

The effect of this bug is that cgi responses following a 204 or 304 one where
sent neither in chunked encoding nor with a content-length header, causing
browsers to stall until the keep alive timeout was reached.

Fix the logic flaw by inverting the chunk prevention flag in the client state
and by testing the chunked encoding preconditions every time instead of
once upon client (re-)initialization.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Backport of r47161

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47162 3c298f89-4303-0410-b956-a3cf2f4a3e73
package/network/services/uhttpd/Makefile
package/network/services/uhttpd/files/uhttpd.init