py-scgi: updated to 1.15

1.15:
Improve comments.

Close unwanted file descriptors.

In scgi_server.py, spawn_child() is called at startup to start the
first child and also from delegate_request() when more children are
needed. In the latter case, the parameter 'conn' is passed to
spawn_child() so that the newly-created child knows to close the
file descriptor it has inherited but doesn't need.

The bug is that in the latter case the new child also inherits
various other file descriptors which are not similarly closed,
namely the Unix sockets to its elder siblings, and the TCP listener
socket.

Improve Apache 2 mod_scgi error messages.

If the connection is aborted while sending the response, log an
error but don't generate an internal server error. This can happen
if the client closes the connection before the entire response has
been read. There's nothing the server can do about it.

When an error occurs while reading the response headers, don't
log an error since ap_scan_script_header_err_brigade() has already
done so.

4 files changed, 21 insertions, 26 deletions

diff --git a/www/py-scgi/Makefile b/www/py-scgi/Makefile
index 58fc16f564e..1f88622d6b3 100644
--- a/www/py-scgi/Makefile
+++ b/www/py-scgi/Makefile
@@ -1,7 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2017/01/01 14:44:05 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/24 08:25:30 adam Exp $
 
+DISTNAME=	scgi-1.15
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	www python
+MASTER_SITES=	http://python.ca/scgi/releases/
 
+MAINTAINER=	manu@NetBSD.org
+HOMEPAGE=	http://python.ca/scgi/
 COMMENT=	Simple Common Gateway Interface
 LICENSE=	cnri-license
 
@@ -9,6 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-quixote-[0-9]*:../../devel/py-quixote
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-quixote
 
-.include "../../lang/python/distutils.mk"
+CFLAGS.SunOS+=	-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1
 
-.include "../../www/py-scgi/Makefile.common"
+.include "../../lang/python/distutils.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/py-scgi/Makefile.common b/www/py-scgi/Makefile.common
deleted file mode 100644
index 053e0ecad8f..00000000000
--- a/www/py-scgi/Makefile.common
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2014/11/24 04:42:33 mef Exp $
-#
-# used by www/py-scgi/Makefile
-# used by www/ap-scgi/Makefile
-
-DISTNAME=	scgi-1.14
-CATEGORIES=	www
-MASTER_SITES=	http://python.ca/scgi/releases/
-
-MAINTAINER=	manu@NetBSD.org
-HOMEPAGE=	http://python.ca/scgi/
-
-DISTINFO_FILE=          ${.CURDIR}/../../www/py-scgi/distinfo
-
-CFLAGS.SunOS+=	-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/py-scgi/PLIST b/www/py-scgi/PLIST
index 0c7d682aa81..151e7987e4e 100644
--- a/www/py-scgi/PLIST
+++ b/www/py-scgi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/04/08 20:22:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/03/24 08:25:30 adam Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/scgi/__init__.py
 ${PYSITELIB}/scgi/__init__.pyc
@@ -10,6 +10,12 @@ ${PYSITELIB}/scgi/quixote_handler.pyo
 ${PYSITELIB}/scgi/scgi_server.py
 ${PYSITELIB}/scgi/scgi_server.pyc
 ${PYSITELIB}/scgi/scgi_server.pyo
+${PYSITELIB}/scgi/scgi_session_server.py
+${PYSITELIB}/scgi/scgi_session_server.pyc
+${PYSITELIB}/scgi/scgi_session_server.pyo
 ${PYSITELIB}/scgi/test_passfd.py
 ${PYSITELIB}/scgi/test_passfd.pyc
 ${PYSITELIB}/scgi/test_passfd.pyo
+${PYSITELIB}/scgi/wsgi_handler.py
+${PYSITELIB}/scgi/wsgi_handler.pyc
+${PYSITELIB}/scgi/wsgi_handler.pyo
diff --git a/www/py-scgi/distinfo b/www/py-scgi/distinfo
index 70fc387849c..8a29910db40 100644
--- a/www/py-scgi/distinfo
+++ b/www/py-scgi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 02:47:31 agc Exp $
+$NetBSD: distinfo,v 1.4 2018/03/24 08:25:30 adam Exp $
 
-SHA1 (scgi-1.14.tar.gz) = 7efcdb2ca0336b20fd579094ce60f0055ef3bfff
-RMD160 (scgi-1.14.tar.gz) = 8214b939d52c6ba7e4392c70efa829d05941fc25
-SHA512 (scgi-1.14.tar.gz) = 148986aab3a5579b7dd7d15583990844149b799df32221b4d2c354b11361f79727087d63ddd54227d2aae937253997774e521606c7baea6b808b9efef025a01a
-Size (scgi-1.14.tar.gz) = 29406 bytes
+SHA1 (scgi-1.15.tar.gz) = 4fd17f55514aebcad9af9b50b1f1d882db5c70ea
+RMD160 (scgi-1.15.tar.gz) = 621413709debb59f16a49d59825b29e9a40d09b9
+SHA512 (scgi-1.15.tar.gz) = 6d4d9938dcd18d38d397e49aa27cc1dcf764dd81cff7df3ba7531c298a521712b39c3c6743369f04a78d702b79559c5ce9a14d2069235224562f3bce912882f4
+Size (scgi-1.15.tar.gz) = 32984 bytes