Date: Fri, 14 Dec 2018 13:57:09 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487436 - in head/www/mod_fastcgi: . files Message-ID: <201812141357.wBEDv9Ej074754@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Fri Dec 14 13:57:09 2018 New Revision: 487436 URL: https://svnweb.freebsd.org/changeset/ports/487436 Log: www:mod_fastcgi: Update to 2.4.7.1 The website of fastcgi has been down for a long time. The project is now in a GitHub archive: https://github.com/FastCGI-Archives Also switch to GitHub with www/mod_fastcgi Changelog: *) cast from pointer to integer of different size fix *) fix prinf %d warning *) .cvsignore to .gitignore *) apache 2.4 compile fix - While I am here, use "make makepatch" for the patches in /files Approved by: brnrd (apache) With hat: apache Sponsored by: Netzkommune GmbH Differential Revision: https://reviews.freebsd.org/D18471 Deleted: head/www/mod_fastcgi/files/patch-fcgi.h Modified: head/www/mod_fastcgi/Makefile head/www/mod_fastcgi/distinfo head/www/mod_fastcgi/files/patch-fcgi_protocol.c head/www/mod_fastcgi/files/patch-fcgi_util.c head/www/mod_fastcgi/files/patch-mod_fastcgi.c head/www/mod_fastcgi/pkg-descr Modified: head/www/mod_fastcgi/Makefile ============================================================================== --- head/www/mod_fastcgi/Makefile Fri Dec 14 13:50:47 2018 (r487435) +++ head/www/mod_fastcgi/Makefile Fri Dec 14 13:57:09 2018 (r487436) @@ -2,18 +2,18 @@ # $FreeBSD$ PORTNAME= mod_fastcgi -PORTVERSION= 2.4.7 -PORTREVISION= 1 +PORTVERSION= 2.4.7.1 CATEGORIES= www -MASTER_SITES= http://www.fastcgi.com/dist/ \ - LOCAL/ohauer -DISTNAME= mod_fastcgi-SNAP-0910052141 DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org -COMMENT= Apache 2.2 fast-cgi module +COMMENT= Apache 2.4 fast-cgi module -USES= apache:2.2+ +USES= apache:2.4+ + +USE_GITHUB= yes +GH_ACCOUNT= FastCGI-Archives + AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= *.c Modified: head/www/mod_fastcgi/distinfo ============================================================================== --- head/www/mod_fastcgi/distinfo Fri Dec 14 13:50:47 2018 (r487435) +++ head/www/mod_fastcgi/distinfo Fri Dec 14 13:57:09 2018 (r487436) @@ -1,2 +1,3 @@ -SHA256 (apache2/mod_fastcgi-SNAP-0910052141.tar.gz) = e6564ae206284806c781834e9e89aa4b0a4dd647b45c6da5cc389c65a984bdc7 -SIZE (apache2/mod_fastcgi-SNAP-0910052141.tar.gz) = 103255 +TIMESTAMP = 1544180674 +SHA256 (apache2/FastCGI-Archives-mod_fastcgi-2.4.7.1_GH0.tar.gz) = 4ba3509b498463f42401fe6911aa410561efbed93d43bb12ad8f7ee7c6318ab8 +SIZE (apache2/FastCGI-Archives-mod_fastcgi-2.4.7.1_GH0.tar.gz) = 112142 Modified: head/www/mod_fastcgi/files/patch-fcgi_protocol.c ============================================================================== --- head/www/mod_fastcgi/files/patch-fcgi_protocol.c Fri Dec 14 13:50:47 2018 (r487435) +++ head/www/mod_fastcgi/files/patch-fcgi_protocol.c Fri Dec 14 13:57:09 2018 (r487436) @@ -1,10 +1,10 @@ ---- fcgi_protocol.c.orig +--- fcgi_protocol.c.orig 2017-03-29 21:11:44 UTC +++ fcgi_protocol.c -@@ -475,7 +475,7 @@ +@@ -475,7 +475,7 @@ int fcgi_protocol_dequeue(pool *p, fcgi_request *fr) ap_log_rerror(FCGI_LOG_ERR_NOERRNO, fr->r, "FastCGI: comm with server \"%s\" aborted: protocol error: " "invalid FCGI_END_REQUEST size: " -- "%d != sizeof(FCGI_EndRequestBody)(%d)", +- "%d != sizeof(FCGI_EndRequestBody)(%ld)", + "%d != sizeof(FCGI_EndRequestBody)(%zu)", fr->fs_path, fr->dataLen, sizeof(FCGI_EndRequestBody)); return HTTP_INTERNAL_SERVER_ERROR; Modified: head/www/mod_fastcgi/files/patch-fcgi_util.c ============================================================================== --- head/www/mod_fastcgi/files/patch-fcgi_util.c Fri Dec 14 13:50:47 2018 (r487435) +++ head/www/mod_fastcgi/files/patch-fcgi_util.c Fri Dec 14 13:57:09 2018 (r487436) @@ -1,6 +1,6 @@ ---- fcgi_util.c.orig +--- fcgi_util.c.orig 2017-03-29 21:11:44 UTC +++ fcgi_util.c -@@ -268,13 +268,17 @@ +@@ -268,13 +268,17 @@ fcgi_util_check_access(pool *tp, /* Get the user membership for the file's group. If the * uid is a member, check the group bits. */ { @@ -23,7 +23,7 @@ if (mode & R_OK && !(statBuf->st_mode & S_IRGRP)) return "read not allowed by group"; if (mode & W_OK && !(statBuf->st_mode & S_IWGRP)) -@@ -445,8 +449,9 @@ +@@ -445,8 +449,9 @@ fcgi_util_fs_set_uid_n_gid(pool *p, fcgi_server *s, ui { #ifndef WIN32 @@ -34,7 +34,7 @@ if (fcgi_wrapper == NULL) return NULL; -@@ -467,14 +472,14 @@ +@@ -467,14 +472,14 @@ fcgi_util_fs_set_uid_n_gid(pool *p, fcgi_server *s, ui s->username = s->user; s->gid = gid; Modified: head/www/mod_fastcgi/files/patch-mod_fastcgi.c ============================================================================== --- head/www/mod_fastcgi/files/patch-mod_fastcgi.c Fri Dec 14 13:50:47 2018 (r487435) +++ head/www/mod_fastcgi/files/patch-mod_fastcgi.c Fri Dec 14 13:57:09 2018 (r487436) @@ -1,18 +1,6 @@ ---- mod_fastcgi.c.orig +--- mod_fastcgi.c.orig 2017-03-29 21:11:44 UTC +++ mod_fastcgi.c -@@ -753,6 +753,11 @@ - continue; - } - -+ if (strcasecmp(name, "Content-Length") == 0) { -+ ap_set_content_length(r, strtol(value, NULL, 10)); -+ continue; -+ } -+ - /* If the script wants them merged, it can do it */ - ap_table_add(r->err_headers_out, name, value); - continue; -@@ -2215,7 +2220,7 @@ +@@ -2219,7 +2219,7 @@ SERVER_SEND: if (select_status < 0) { ap_log_rerror(FCGI_LOG_ERR_ERRNO, r, "FastCGI: comm with server " @@ -21,12 +9,12 @@ state = STATE_ERROR; break; } -@@ -2298,7 +2303,7 @@ +@@ -2302,7 +2302,7 @@ SERVER_SEND: else { - ap_log_rerror(FCGI_LOG_ERR, r, "FastCGI: comm with server " -- "\"%s\" aborted: read failed", fr->fs_path); -+ "\"%s\" aborted: read failed: \"%s\"", fr->fs_path, strerror(errno)); - state = STATE_ERROR; - break; - } + ap_log_rerror(FCGI_LOG_ERR, r, "FastCGI: comm with server " +- "\"%s\" aborted: read failed", fr->fs_path); ++ "\"%s\" aborted: read failed: \"%s\"", fr->fs_path, strerror(errno)); + state = STATE_ERROR; + break; + } Modified: head/www/mod_fastcgi/pkg-descr ============================================================================== --- head/www/mod_fastcgi/pkg-descr Fri Dec 14 13:50:47 2018 (r487435) +++ head/www/mod_fastcgi/pkg-descr Fri Dec 14 13:57:09 2018 (r487436) @@ -4,4 +4,4 @@ FastCGI is a language independent, scalable, open exte provides high performance without the limitations of server specific APIs. See the docs for more details. -WWW: http://www.fastcgi.com/ +WWW: https://github.com/FastCGI-Archives/mod_fastcgi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812141357.wBEDv9Ej074754>