Attachment #161514 for bug #203355




# $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $

PORTNAME=	mod_scgi
PORTVERSION=	1.14
PORTREVISION=	2
CATEGORIES=	www
MASTER_SITES=	http://dryice.name/computer/FreeBSD/distfiles/
DISTNAME=	scgi-${PORTVERSION:S/.a/a/}

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

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

USE_APACHE=	22+
AP_FAST_BUILD=	yes
AP_GENPLIST=	yes


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
+++ mod_scgi.c
@@ -135,16 +135,16 @@
     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 @@
     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 @@
 	    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)




# Created by: Neil Blakey-Milner <nbm@FreeBSD.org>
# $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $

PORTNAME=	mod_scgi
PORTVERSION=	1.12
PORTREVISION=	2
CATEGORIES=	www
MASTER_SITES=	http://dryice.name/computer/FreeBSD/distfiles/
DISTNAME=	scgi-${PORTVERSION:S/.a/a/}

MAINTAINER=	dryice@dryice.name
COMMENT=	Apache 2.2 module that implements the client side of the SCGI protocol

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

USE_APACHE=	22
AP_FAST_BUILD=	yes
AP_GENPLIST=	yes

.include <bsd.port.mk>

Line 0 Link Here

(-)mod_scgi/distinfo (+2 lines)
	1	SHA256 (scgi-1.12.tar.gz) = aac7904154c0cdc1b987365a6b9b84719e36af07a7044d6ced12aa5bb099b754
	2	SIZE (scgi-1.12.tar.gz) = 28132

Line 0 Link Here

(-)mod_scgi/pkg-descr (+9 lines)
	1	An Apache module that implements the client side of the Simple Common
	2	Gateway Interface protocol.
	3
	4	The SCGI protocol is a replacement for the Common Gateway Interface
	5	(CGI) protocol. It is a standard for applications to interface with
	6	HTTP servers. It is similar to FastCGI but is designed to be easier to
	7	implement.
	8
	9	WWW: http://www.mems-exchange.org/software/scgi/

Line 0 Link Here

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




Index: Makefile
===================================================================
--- Makefile	(working copy)
+++ Makefile	(.../..)	(working copy)
@@ -2,19 +2,18 @@
 # $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $
 
 PORTNAME=	mod_scgi
-PORTVERSION=	1.12
-PORTREVISION=	2
+PORTVERSION=	1.14
 CATEGORIES=	www
 MASTER_SITES=	http://dryice.name/computer/FreeBSD/distfiles/
 DISTNAME=	scgi-${PORTVERSION:S/.a/a/}
 
-MAINTAINER=	dryice@dryice.name
+MAINTAINER=	w.schwarzenfeld@aon.at
 COMMENT=	Apache 2.2 module that implements the client side of the SCGI protocol
 
 SCGI_DIR=	apache2
 WRKSRC=		${WRKDIR}/${DISTNAME}/${SCGI_DIR}
 
-USE_APACHE=	22
+USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Property changes on: Makefile
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: distinfo
===================================================================
--- distinfo	(working copy)
+++ distinfo	(.../..)	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (scgi-1.12.tar.gz) = aac7904154c0cdc1b987365a6b9b84719e36af07a7044d6ced12aa5bb099b754
-SIZE (scgi-1.12.tar.gz) = 28132
+SHA256 (scgi-1.14.tar.gz) = 0cde41e4ae58ea666f17f6b1984e8ed8ebaff92cabac4b1b36f86bc47eb18e75
+SIZE (scgi-1.14.tar.gz) = 29406

Property changes on: distinfo
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: files/patch-mod_scgi-1.14-apache-2.4
===================================================================
--- files/patch-mod_scgi-1.14-apache-2.4	(working copy)
+++ files/patch-mod_scgi-1.14-apache-2.4	(.../..)	(working copy)
@@ -0,0 +1,49 @@
+--- mod_scgi.c
++++ mod_scgi.c
+@@ -135,16 +135,16 @@
+     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);

Index: Makefile
===================================================================
--- Makefile	(working copy)
+++ Makefile	(.../..)	(working copy)
@@ -2,19 +2,18 @@
 # $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $
 
 PORTNAME=	mod_scgi
-PORTVERSION=	1.12
-PORTREVISION=	2
+PORTVERSION=	1.14
 CATEGORIES=	www
 MASTER_SITES=	http://dryice.name/computer/FreeBSD/distfiles/
 DISTNAME=	scgi-${PORTVERSION:S/.a/a/}
 
-MAINTAINER=	dryice@dryice.name
+MAINTAINER=	w.schwarzenfeld@aon.at
 COMMENT=	Apache 2.2 module that implements the client side of the SCGI protocol
 
 SCGI_DIR=	apache2
 WRKSRC=		${WRKDIR}/${DISTNAME}/${SCGI_DIR}
 
-USE_APACHE=	22
+USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Property changes on: Makefile
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: distinfo
===================================================================
--- distinfo	(working copy)
+++ distinfo	(.../..)	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (scgi-1.12.tar.gz) = aac7904154c0cdc1b987365a6b9b84719e36af07a7044d6ced12aa5bb099b754
-SIZE (scgi-1.12.tar.gz) = 28132
+SHA256 (scgi-1.14.tar.gz) = 0cde41e4ae58ea666f17f6b1984e8ed8ebaff92cabac4b1b36f86bc47eb18e75
+SIZE (scgi-1.14.tar.gz) = 29406

Property changes on: distinfo
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: files/patch-mod_scgi-1.14-apache-2.4
===================================================================
--- files/patch-mod_scgi-1.14-apache-2.4	(working copy)
+++ files/patch-mod_scgi-1.14-apache-2.4	(.../..)	(working copy)
@@ -0,0 +1,49 @@
+--- mod_scgi.c
++++ mod_scgi.c
+@@ -135,16 +135,16 @@
+     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 @@
+     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 @@
+ 	    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)
\ No newline at end of file
Index: mod_scgi/Makefile
===================================================================
--- mod_scgi/Makefile	(working copy)
+++ mod_scgi/Makefile	(.../..)	(working copy)
@@ -0,0 +1,21 @@
+# Created by: Neil Blakey-Milner <nbm@FreeBSD.org>
+# $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $
+
+PORTNAME=	mod_scgi
+PORTVERSION=	1.12
+PORTREVISION=	2
+CATEGORIES=	www
+MASTER_SITES=	http://dryice.name/computer/FreeBSD/distfiles/
+DISTNAME=	scgi-${PORTVERSION:S/.a/a/}
+
+MAINTAINER=	dryice@dryice.name
+COMMENT=	Apache 2.2 module that implements the client side of the SCGI protocol
+
+SCGI_DIR=	apache2
+WRKSRC=		${WRKDIR}/${DISTNAME}/${SCGI_DIR}
+
+USE_APACHE=	22
+AP_FAST_BUILD=	yes
+AP_GENPLIST=	yes
+
+.include <bsd.port.mk>

Property changes on: mod_scgi/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: mod_scgi/distinfo
===================================================================
--- mod_scgi/distinfo	(working copy)
+++ mod_scgi/distinfo	(.../..)	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (scgi-1.12.tar.gz) = aac7904154c0cdc1b987365a6b9b84719e36af07a7044d6ced12aa5bb099b754
+SIZE (scgi-1.12.tar.gz) = 28132

Property changes on: mod_scgi/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: mod_scgi/pkg-descr
===================================================================

Return to bug 203355

Lines 2-20 Link Here

(-)Makefile (-4 / +3 lines)
2	# $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $	2	# $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $
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://dryice.name/computer/FreeBSD/distfiles/
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 2.2 module that implements the client side of the SCGI protocol
13		12
14	SCGI_DIR= apache2	13	SCGI_DIR= apache2
15	WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR}	14	WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR}
16		15
17	USE_APACHE= 22	16	USE_APACHE= 22+
18	AP_FAST_BUILD= yes	17	AP_FAST_BUILD= yes
19	AP_GENPLIST= yes	18	AP_GENPLIST= yes
20		19

Line 0 Link Here

(-)files/patch-mod_scgi-1.14-apache-2.4 (+49 lines)
	1	--- mod_scgi.c
	2	+++ mod_scgi.c
	3	@@ -135,16 +135,16 @@
	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 @@
	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 @@
	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)

Line 0 Link Here

(-)mod_scgi/Makefile (+21 lines)
	1	# Created by: Neil Blakey-Milner <nbm@FreeBSD.org>
	2	# $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $
	3
	4	PORTNAME= mod_scgi
	5	PORTVERSION= 1.12
	6	PORTREVISION= 2
	7	CATEGORIES= www
	8	MASTER_SITES= http://dryice.name/computer/FreeBSD/distfiles/
	9	DISTNAME= scgi-${PORTVERSION:S/.a/a/}
	10
	11	MAINTAINER= dryice@dryice.name
	12	COMMENT= Apache 2.2 module that implements the client side of the SCGI protocol
	13
	14	SCGI_DIR= apache2
	15	WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR}
	16
	17	USE_APACHE= 22
	18	AP_FAST_BUILD= yes
	19	AP_GENPLIST= yes
	20
	21	.include <bsd.port.mk>

Line 0 Link Here

(-)svn_diff_mod_scgi (-186 / +82 lines)
		1	Index: Makefile
		2	===================================================================
		3	--- Makefile (working copy)
		4	+++ Makefile (.../..) (working copy)
		5	@@ -2,19 +2,18 @@
		6	# $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $
		7
		8	PORTNAME= mod_scgi
		9	-PORTVERSION= 1.12
		10	-PORTREVISION= 2
		11	+PORTVERSION= 1.14
		12	CATEGORIES= www
		13	MASTER_SITES= http://dryice.name/computer/FreeBSD/distfiles/
		14	DISTNAME= scgi-${PORTVERSION:S/.a/a/}
		15
		16	-MAINTAINER= dryice@dryice.name
		17	+MAINTAINER= w.schwarzenfeld@aon.at
		18	COMMENT= Apache 2.2 module that implements the client side of the SCGI protocol
		19
		20	SCGI_DIR= apache2
		21	WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR}
		22
		23	-USE_APACHE= 22
		24	+USE_APACHE= 22+
		25	AP_FAST_BUILD= yes
		26	AP_GENPLIST= yes
		27
		28
		29	Property changes on: Makefile
		30	___________________________________________________________________
		31	Deleted: svn:eol-style
		32	## -1 +0,0 ##
		33	-native
		34	\ No newline at end of property
		35	Deleted: svn:keywords
		36	## -1 +0,0 ##
		37	-FreeBSD=%H
		38	\ No newline at end of property
		39	Deleted: svn:mime-type
		40	## -1 +0,0 ##
		41	-text/plain
		42	\ No newline at end of property
		43	Index: distinfo
		44	===================================================================
		45	--- distinfo (working copy)
		46	+++ distinfo (.../..) (working copy)
		47	@@ -1,2 +1,2 @@
		48	-SHA256 (scgi-1.12.tar.gz) = aac7904154c0cdc1b987365a6b9b84719e36af07a7044d6ced12aa5bb099b754
		49	-SIZE (scgi-1.12.tar.gz) = 28132
		50	+SHA256 (scgi-1.14.tar.gz) = 0cde41e4ae58ea666f17f6b1984e8ed8ebaff92cabac4b1b36f86bc47eb18e75
		51	+SIZE (scgi-1.14.tar.gz) = 29406
		52
		53	Property changes on: distinfo
		54	___________________________________________________________________
		55	Deleted: fbsd:nokeywords
		56	## -1 +0,0 ##
		57	-yes
		58	\ No newline at end of property
		59	Deleted: svn:eol-style
		60	## -1 +0,0 ##
		61	-native
		62	\ No newline at end of property
		63	Deleted: svn:mime-type
		64	## -1 +0,0 ##
65	-text/plain
66	\ No newline at end of property
67	Index: files/patch-mod_scgi-1.14-apache-2.4
68	===================================================================
69	--- files/patch-mod_scgi-1.14-apache-2.4 (working copy)
70	+++ files/patch-mod_scgi-1.14-apache-2.4 (.../..) (working copy)
71	@@ -0,0 +1,49 @@
72	+--- mod_scgi.c
73	++++ mod_scgi.c
74	+@@ -135,16 +135,16 @@
75	+ return DECLINED;
76	+ }
77	+
78	+-static void log_err(const char file, int line, request_rec r,
79	++static void log_err(const char file, int line, int index, request_rec r,
80	+ apr_status_t status, const char *msg)
81	+ {
82	+- ap_log_rerror(file, line, APLOG_ERR, status, r, "scgi: %s", msg);
Lines 1-186 Link Here
1	Index: Makefile
2	===================================================================
3	--- Makefile (working copy)
4	+++ Makefile (.../..) (working copy)
5	@@ -2,19 +2,18 @@
6	# $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $
7
8	PORTNAME= mod_scgi
9	-PORTVERSION= 1.12
10	-PORTREVISION= 2
11	+PORTVERSION= 1.14
12	CATEGORIES= www
13	MASTER_SITES= http://dryice.name/computer/FreeBSD/distfiles/
14	DISTNAME= scgi-${PORTVERSION:S/.a/a/}
15
16	-MAINTAINER= dryice@dryice.name
17	+MAINTAINER= w.schwarzenfeld@aon.at
18	COMMENT= Apache 2.2 module that implements the client side of the SCGI protocol
19
20	SCGI_DIR= apache2
21	WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR}
22
23	-USE_APACHE= 22
24	+USE_APACHE= 22+
25	AP_FAST_BUILD= yes
26	AP_GENPLIST= yes
27
28
29	Property changes on: Makefile
30	___________________________________________________________________
31	Deleted: svn:eol-style
32	## -1 +0,0 ##
33	-native
34	\ No newline at end of property
35	Deleted: svn:keywords
36	## -1 +0,0 ##
37	-FreeBSD=%H
38	\ No newline at end of property
39	Deleted: svn:mime-type
40	## -1 +0,0 ##
41	-text/plain
42	\ No newline at end of property
43	Index: distinfo
44	===================================================================
45	--- distinfo (working copy)
46	+++ distinfo (.../..) (working copy)
47	@@ -1,2 +1,2 @@
48	-SHA256 (scgi-1.12.tar.gz) = aac7904154c0cdc1b987365a6b9b84719e36af07a7044d6ced12aa5bb099b754
49	-SIZE (scgi-1.12.tar.gz) = 28132
50	+SHA256 (scgi-1.14.tar.gz) = 0cde41e4ae58ea666f17f6b1984e8ed8ebaff92cabac4b1b36f86bc47eb18e75
51	+SIZE (scgi-1.14.tar.gz) = 29406
52
53	Property changes on: distinfo
54	___________________________________________________________________
55	Deleted: fbsd:nokeywords
56	## -1 +0,0 ##
57	-yes
58	\ No newline at end of property
59	Deleted: svn:eol-style
60	## -1 +0,0 ##
61	-native
62	\ No newline at end of property
63	Deleted: svn:mime-type
64	## -1 +0,0 ##
65	-text/plain
66	\ No newline at end of property
67	Index: files/patch-mod_scgi-1.14-apache-2.4
68	===================================================================
69	--- files/patch-mod_scgi-1.14-apache-2.4 (working copy)
70	+++ files/patch-mod_scgi-1.14-apache-2.4 (.../..) (working copy)
71	@@ -0,0 +1,49 @@
72	+--- mod_scgi.c
73	++++ mod_scgi.c
74	+@@ -135,16 +135,16 @@
75	+ return DECLINED;
76	+ }
77	+
78	+-static void log_err(const char file, int line, request_rec r,
79	++static void log_err(const char file, int line, int index, request_rec r,
80	+ apr_status_t status, const char *msg)
81	+ {
82	+- ap_log_rerror(file, line, APLOG_ERR, status, r, "scgi: %s", msg);
83	++ ap_log_rerror(file, line, index, APLOG_ERR, status, r, "scgi: %s", msg);
84	+ }
85	+
86	+-static void log_debug(const char file, int line, request_rec r, const
87	++static void log_debug(const char file, int line, int index, request_rec r, const
88	+ char *msg)
89	+ {
90	+- ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg);
91	++ ap_log_rerror(file, line, index, APLOG_DEBUG, APR_SUCCESS, r, "%s", msg);
92	+ }
93	+
94	+ static char http2env(apr_pool_t p, const char *name)
95	+@@ -312,7 +312,7 @@
96	+ int i;
97	+ apr_status_t rv = 0;
98	+ apr_port_t port = 0;
99	+- GET_PORT(port, r->connection->remote_addr);
100	++ GET_PORT(port, r->useragent_addr);
101	+
102	+ log_debug(APLOG_MARK,r, "sending headers");
103	+ t = apr_table_make(r->pool, 40);
104	+@@ -324,14 +324,14 @@
105	+ buf = "0";
106	+ add_header(t, "CONTENT_LENGTH", buf);
107	+ add_header(t, "SCGI", SCGI_PROTOCOL_VERSION);
108	+- add_header(t, "SERVER_SOFTWARE", ap_get_server_version());
109	++ add_header(t, "SERVER_SOFTWARE", ap_get_server_banner());
110	+ add_header(t, "SERVER_PROTOCOL", r->protocol);
111	+ add_header(t, "SERVER_NAME", ap_get_server_name(r));
112	+ add_header(t, "SERVER_ADMIN", r->server->server_admin);
113	+ add_header(t, "SERVER_ADDR", r->connection->local_ip);
114	+ add_header(t, "SERVER_PORT", apr_psprintf(r->pool, "%u",
115	+ ap_get_server_port(r)));
116	+- add_header(t, "REMOTE_ADDR", r->connection->remote_ip);
117	++ add_header(t, "REMOTE_ADDR", r->useragent_ip);
118	+ add_header(t, "REMOTE_PORT", apr_psprintf(r->pool, "%d", port));
119	+ add_header(t, "REMOTE_USER", r->user);
120	+ add_header(t, "REQUEST_METHOD", r->method)
121	\ No newline at end of file
122	Index: mod_scgi/Makefile
123	===================================================================
124	--- mod_scgi/Makefile (working copy)
125	+++ mod_scgi/Makefile (.../..) (working copy)
126	@@ -0,0 +1,21 @@
127	+# Created by: Neil Blakey-Milner <nbm@FreeBSD.org>
128	+# $FreeBSD: head/www/mod_scgi/Makefile 336589 2013-12-15 22:11:20Z ohauer $
129	+
130	+PORTNAME= mod_scgi
131	+PORTVERSION= 1.12
132	+PORTREVISION= 2
133	+CATEGORIES= www
134	+MASTER_SITES= http://dryice.name/computer/FreeBSD/distfiles/
135	+DISTNAME= scgi-${PORTVERSION:S/.a/a/}
136	+
137	+MAINTAINER= dryice@dryice.name
138	+COMMENT= Apache 2.2 module that implements the client side of the SCGI protocol
139	+
140	+SCGI_DIR= apache2
141	+WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR}
142	+
143	+USE_APACHE= 22
144	+AP_FAST_BUILD= yes
145	+AP_GENPLIST= yes
146	+
147	+.include <bsd.port.mk>
148
149	Property changes on: mod_scgi/Makefile
150	___________________________________________________________________
151	Added: svn:eol-style
152	## -0,0 +1 ##
153	+native
154	\ No newline at end of property
155	Added: svn:keywords
156	## -0,0 +1 ##
157	+FreeBSD=%H
158	\ No newline at end of property
159	Added: svn:mime-type
160	## -0,0 +1 ##
161	+text/plain
162	\ No newline at end of property
163	Index: mod_scgi/distinfo
164	===================================================================
165	--- mod_scgi/distinfo (working copy)
166	+++ mod_scgi/distinfo (.../..) (working copy)
167	@@ -0,0 +1,2 @@
168	+SHA256 (scgi-1.12.tar.gz) = aac7904154c0cdc1b987365a6b9b84719e36af07a7044d6ced12aa5bb099b754
169	+SIZE (scgi-1.12.tar.gz) = 28132
170
171	Property changes on: mod_scgi/distinfo
172	___________________________________________________________________
173	Added: fbsd:nokeywords
174	## -0,0 +1 ##
175	+yes
176	\ No newline at end of property
177	Added: svn:eol-style
178	## -0,0 +1 ##
179	+native
180	\ No newline at end of property
181	Added: svn:mime-type
182	## -0,0 +1 ##
183	+text/plain
184	\ No newline at end of property
185	Index: mod_scgi/pkg-descr
186	===================================================================