Attachment #161893 for bug #203355




# $FreeBSD$

PORTNAME=	mod_scgi
PORTVERSION=	1.14
PORTREVISION=	2
CATEGORIES=	www
MASTER_SITES=	http://python.ca/scgi/releases/
DISTNAME=	scgi-${PORTVERSION:S/.a/a/}

MAINTAINER=	w.schwarzenfeld@aon.at
COMMENT=	Apache module that implements the client side of the SCGI protocol

LICENSE=	MIT
LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE.txt

SCGI_DIR=	apache2
WRKSRC=		${WRKDIR}/${DISTNAME}/${SCGI_DIR}

USE_APACHE=	22+
AP_FAST_BUILD=	yes
AP_GENPLIST=	yes

.include <bsd.port.pre.mk>

.if ${APACHE_VERSION} == 24
EXTRA_PATCHES=	${FILESDIR}/apache24-compat-mod__scgi.c
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (scgi-1.12.tar.gz) = aac7904154c0cdc1b987365a6b9b84719e36af07a7044d6ced12aa5bb099b754	1	SHA256 (scgi-1.14.tar.gz) = 0cde41e4ae58ea666f17f6b1984e8ed8ebaff92cabac4b1b36f86bc47eb18e75
2	SIZE (scgi-1.12.tar.gz) = 28132	2	SIZE (scgi-1.14.tar.gz) = 29406




--- mod_scgi.c.orig	2009-11-21 23:02:06 UTC
+++ mod_scgi.c
@@ -135,16 +135,16 @@ static int scgi_map_location(request_rec
     return DECLINED;
 }
 
-static void log_err(const char *file, int line, request_rec *r,
+static void log_err(const char *file, int line, int index, request_rec *r,
                     apr_status_t status, const char *msg)
 {
-    ap_log_rerror(file, line, APLOG_ERR, status, r, "scgi: %s", msg);
+    ap_log_rerror(file, line, index, APLOG_ERR, status, r, "scgi: %s", msg);
 }
 
-static void log_debug(const char *file, int line, request_rec *r, const
+static void log_debug(const char *file, int line, int index, request_rec *r, const
                       char *msg)
 {
-    ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg);
+    ap_log_rerror(file, line, index, APLOG_DEBUG, APR_SUCCESS, r, "%s", msg);
 }
 
 static char *http2env(apr_pool_t *p, const char *name)
@@ -312,7 +312,7 @@ send_headers(request_rec *r, struct sock
     int i;
     apr_status_t rv = 0;
     apr_port_t  port = 0;
-    GET_PORT(port, r->connection->remote_addr);
+    GET_PORT(port, r->useragent_addr);
 
     log_debug(APLOG_MARK,r, "sending headers");
     t = apr_table_make(r->pool, 40);
@@ -324,14 +324,14 @@ send_headers(request_rec *r, struct sock
 	    buf = "0";
     add_header(t, "CONTENT_LENGTH",  buf);
     add_header(t, "SCGI", SCGI_PROTOCOL_VERSION);
-    add_header(t, "SERVER_SOFTWARE", ap_get_server_version());
+    add_header(t, "SERVER_SOFTWARE", ap_get_server_banner());
     add_header(t, "SERVER_PROTOCOL", r->protocol);
     add_header(t, "SERVER_NAME", ap_get_server_name(r));
     add_header(t, "SERVER_ADMIN", r->server->server_admin);
     add_header(t, "SERVER_ADDR", r->connection->local_ip);
     add_header(t, "SERVER_PORT", apr_psprintf(r->pool, "%u",
                                               ap_get_server_port(r)));
-    add_header(t, "REMOTE_ADDR", r->connection->remote_ip);
+    add_header(t, "REMOTE_ADDR", r->useragent_ip);
     add_header(t, "REMOTE_PORT", apr_psprintf(r->pool, "%d", port));
     add_header(t, "REMOTE_USER", r->user);
     add_header(t, "REQUEST_METHOD", r->method);

Lines 6-9 Link Here

(-)pkg-descr (-1 / +1 lines)
6	HTTP servers. It is similar to FastCGI but is designed to be easier to	6	HTTP servers. It is similar to FastCGI but is designed to be easier to
7	implement.	7	implement.
8		8
9	WWW: http://www.mems-exchange.org/software/scgi/	9	WWW: http://python.ca/scgi/

Lines 1-3 Link Here

(-)pkg-message (-1 / +1 lines)
1	********************************************************************	1	********************************************************************
2	* If your mod_scgi seg fault, try disable mod_fastcgi *	2	* If your mod_scgi seg faults, try disabling mod_fastcgi *
3	********************************************************************	3	********************************************************************

Return to bug 203355

Lines 2-21 Link Here

(-)Makefile (-7 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mod_scgi	4	PORTNAME= mod_scgi
5	PORTVERSION= 1.12	5	PORTVERSION= 1.14
6	PORTREVISION= 2
7	CATEGORIES= www	6	CATEGORIES= www
8	MASTER_SITES= http://dryice.name/computer/FreeBSD/distfiles/	7	MASTER_SITES= http://python.ca/scgi/releases/
9	DISTNAME= scgi-${PORTVERSION:S/.a/a/}	8	DISTNAME= scgi-${PORTVERSION:S/.a/a/}
10		9
11	MAINTAINER= dryice@dryice.name	10	MAINTAINER= w.schwarzenfeld@aon.at
12	COMMENT= Apache 2.2 module that implements the client side of the SCGI protocol	11	COMMENT= Apache module that implements the client side of the SCGI protocol
13		12
		13	LICENSE= MIT
		14	LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE.txt
		15
14	SCGI_DIR= apache2	16	SCGI_DIR= apache2
15	WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR}	17	WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR}
16		18
17	USE_APACHE= 22	19	USE_APACHE= 22+
18	AP_FAST_BUILD= yes	20	AP_FAST_BUILD= yes
19	AP_GENPLIST= yes	21	AP_GENPLIST= yes
20		22
21	.include <bsd.port.mk>	23	.include <bsd.port.pre.mk>
		24
		25	.if ${APACHE_VERSION} == 24
		26	EXTRA_PATCHES= ${FILESDIR}/apache24-compat-mod__scgi.c
		27	.endif
		28
		29	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/apache24-compat-mod__scgi.c (+49 lines)
	1	--- mod_scgi.c.orig 2009-11-21 23:02:06 UTC
	2	+++ mod_scgi.c
	3	@@ -135,16 +135,16 @@ static int scgi_map_location(request_rec
	4	return DECLINED;
	5	}
	6
	7	-static void log_err(const char file, int line, request_rec r,
	8	+static void log_err(const char file, int line, int index, request_rec r,
	9	apr_status_t status, const char *msg)
	10	{
	11	- ap_log_rerror(file, line, APLOG_ERR, status, r, "scgi: %s", msg);
	12	+ ap_log_rerror(file, line, index, APLOG_ERR, status, r, "scgi: %s", msg);
	13	}
	14
	15	-static void log_debug(const char file, int line, request_rec r, const
	16	+static void log_debug(const char file, int line, int index, request_rec r, const
	17	char *msg)
	18	{
	19	- ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg);
	20	+ ap_log_rerror(file, line, index, APLOG_DEBUG, APR_SUCCESS, r, "%s", msg);
	21	}
	22
	23	static char http2env(apr_pool_t p, const char *name)
	24	@@ -312,7 +312,7 @@ send_headers(request_rec *r, struct sock
	25	int i;
	26	apr_status_t rv = 0;
	27	apr_port_t port = 0;
	28	- GET_PORT(port, r->connection->remote_addr);
	29	+ GET_PORT(port, r->useragent_addr);
	30
	31	log_debug(APLOG_MARK,r, "sending headers");
	32	t = apr_table_make(r->pool, 40);
	33	@@ -324,14 +324,14 @@ send_headers(request_rec *r, struct sock
	34	buf = "0";
	35	add_header(t, "CONTENT_LENGTH", buf);
	36	add_header(t, "SCGI", SCGI_PROTOCOL_VERSION);
	37	- add_header(t, "SERVER_SOFTWARE", ap_get_server_version());
	38	+ add_header(t, "SERVER_SOFTWARE", ap_get_server_banner());
	39	add_header(t, "SERVER_PROTOCOL", r->protocol);
	40	add_header(t, "SERVER_NAME", ap_get_server_name(r));
	41	add_header(t, "SERVER_ADMIN", r->server->server_admin);
	42	add_header(t, "SERVER_ADDR", r->connection->local_ip);
	43	add_header(t, "SERVER_PORT", apr_psprintf(r->pool, "%u",
	44	ap_get_server_port(r)));
	45	- add_header(t, "REMOTE_ADDR", r->connection->remote_ip);
	46	+ add_header(t, "REMOTE_ADDR", r->useragent_ip);
	47	add_header(t, "REMOTE_PORT", apr_psprintf(r->pool, "%d", port));
	48	add_header(t, "REMOTE_USER", r->user);
	49	add_header(t, "REQUEST_METHOD", r->method);