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 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 Index: files/patch-mod_sgci_c =================================================================== --- files/patch-mod_sgci_c (working copy) +++ files/patch-mod_sgci_c (.../..) (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)