Author: jow
Date: 2015-10-08 00:20:55 +0200 (Thu, 08 Oct 2015)
New Revision: 47162
Modified:
branches/chaos_calmer/package/network/services/uhttpd/Makefile
branches/chaos_calmer/package/network/services/uhttpd/files/uhttpd.init
Log:
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 <[email protected]>
Backport of r47161
Modified: branches/chaos_calmer/package/network/services/uhttpd/Makefile
===================================================================
--- branches/chaos_calmer/package/network/services/uhttpd/Makefile
2015-10-07 22:14:48 UTC (rev 47161)
+++ branches/chaos_calmer/package/network/services/uhttpd/Makefile
2015-10-07 22:20:55 UTC (rev 47162)
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd
-PKG_VERSION:=2015-09-07
+PKG_VERSION:=2015-10-08
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/uhttpd2.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=993cace15114a0f06f720f34a4748ab54b695f0d
+PKG_SOURCE_VERSION:=7ed2edc40dd6d0171266f3bfbc96466e1d25e3cd
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MAINTAINER:=Felix Fietkau <[email protected]>
PKG_LICENSE:=ISC
Modified:
branches/chaos_calmer/package/network/services/uhttpd/files/uhttpd.init
===================================================================
--- branches/chaos_calmer/package/network/services/uhttpd/files/uhttpd.init
2015-10-07 22:14:48 UTC (rev 47161)
+++ branches/chaos_calmer/package/network/services/uhttpd/files/uhttpd.init
2015-10-07 22:20:55 UTC (rev 47162)
@@ -131,11 +131,6 @@
}
procd_close_instance
-
- # Check if daemon is running, if not then
- # re-execute in foreground to display error.
-# sleep 1 && service_check $UHTTPD_BIN || \
-# $UHTTPD_BIN -f $UHTTPD_ARGS
}
service_triggers()
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
