summaryrefslogtreecommitdiff
path: root/www/lighttpd/files/patch-src_mod__scgi.c
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2016-10-21 09:01:19 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2016-10-21 09:01:19 +0000
commitae8f325c44b5160be4cf55a7f3fa161a44a71fb1 (patch)
treefcc8da7d50869d0e6969ce0135b1a04b2bd04527 /www/lighttpd/files/patch-src_mod__scgi.c
parentmath/cadabra2: update 2.0.816 -> 2.0.930 (diff)
- Update lighttpd to 1.4.42 [1]
- Convert WEBDAV option to option helpers [1] - Remove MYSQLAUTH option, upstream integrated their own solution in MYSQL support [1] - Add GEOIP option to main port [1] - Fix sorting in pkg-plist [1] - Remove lighttpd-mod_geoip port, it's beeen integrated in the main port [2] PR: 213568 [1], 213569 [2] Sumitted by: Piotr Kubaj <pkubaj@anongoth.pl> (maintainer)
Notes
Notes: svn path=/head/; revision=424396
Diffstat (limited to 'www/lighttpd/files/patch-src_mod__scgi.c')
-rw-r--r--www/lighttpd/files/patch-src_mod__scgi.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/www/lighttpd/files/patch-src_mod__scgi.c b/www/lighttpd/files/patch-src_mod__scgi.c
deleted file mode 100644
index 947356aa1dd3..000000000000
--- a/www/lighttpd/files/patch-src_mod__scgi.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/mod_scgi.c.orig 2016-08-07 12:39:31 UTC
-+++ src/mod_scgi.c
-@@ -2438,7 +2438,20 @@ static handler_t scgi_write_request(serv
-
- if (hctx->wb->bytes_out == hctx->wb_reqlen) {
- fdevent_event_clr(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_OUT);
-- shutdown(hctx->fd, SHUT_WR);
-+ #if (defined(__APPLE__) && defined(__MACH__)) \
-+ || defined(__FreeBSD__) || defined(__NetBSD__) \
-+ || defined(__OpenBSD__) || defined(__DragonflyBSD__)
-+ /*(*BSD stack on remote might signal POLLHUP and remote
-+ * might treat as socket error instead of half-close)*/
-+ #else
-+ /*(remote could be different machine running affected OS,
-+ * so only issue shutdown for known local sockets)*/
-+ if ( '/' == host->host->ptr[0]
-+ || buffer_is_equal_string(host->host, CONST_STR_LEN("127.0.0.1"))
-+ || buffer_is_equal_string(host->host, CONST_STR_LEN("::1"))) {
-+ shutdown(hctx->fd, SHUT_WR);
-+ }
-+ #endif
- scgi_set_state(srv, hctx, FCGI_STATE_READ);
- } else {
- off_t wblen = hctx->wb->bytes_in - hctx->wb->bytes_out;
-@@ -2585,7 +2598,8 @@ SUBREQUEST_FUNC(mod_scgi_handle_subreque
- }
- }
-
-- return (0 == hctx->wb->bytes_in || !chunkqueue_is_empty(hctx->wb))
-+ return ((0 == hctx->wb->bytes_in || !chunkqueue_is_empty(hctx->wb))
-+ && hctx->state != FCGI_STATE_CONNECT)
- ? scgi_send_request(srv, hctx)
- : HANDLER_WAIT_FOR_EVENT;
- }