[Midnightbsd-cvs] mports [20603] U trunk/www/mod_fastcgi/files/patch-mod_fastcgi.c: fastcgi fixes
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 31 15:51:14 EDT 2015
Revision: 20603
http://svnweb.midnightbsd.org/mports/?rev=20603
Author: laffer1
Date: 2015-10-31 15:51:13 -0400 (Sat, 31 Oct 2015)
Log Message:
-----------
fastcgi fixes
Modified Paths:
--------------
trunk/www/mod_fastcgi/Makefile
trunk/www/mod_fastcgi/files/patch-fcgi_util.c
trunk/www/mod_fastcgi/files/patch-mod_fastcgi.c
Added Paths:
-----------
trunk/www/mod_fastcgi/files/patch-fcgi.h
trunk/www/mod_fastcgi/files/patch-fcgi_protocol.c
Property Changed:
----------------
trunk/www/mod_fastcgi/files/patch-fcgi_util.c
trunk/www/mod_fastcgi/files/patch-mod_fastcgi.c
Modified: trunk/www/mod_fastcgi/Makefile
===================================================================
--- trunk/www/mod_fastcgi/Makefile 2015-10-31 19:47:50 UTC (rev 20602)
+++ trunk/www/mod_fastcgi/Makefile 2015-10-31 19:51:13 UTC (rev 20603)
@@ -2,7 +2,7 @@
PORTNAME= mod_fastcgi
PORTVERSION= 2.4.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.fastcgi.com/dist/ \
FREEBSD_LOCAL/ohauer
@@ -10,7 +10,7 @@
DIST_SUBDIR= apache2
MAINTAINER= ports at FreeBSD.org
-COMMENT= Fast-cgi module for Apache
+COMMENT= Apache 2.2 Fast-cgi module
LICENSE= other
Added: trunk/www/mod_fastcgi/files/patch-fcgi.h
===================================================================
--- trunk/www/mod_fastcgi/files/patch-fcgi.h (rev 0)
+++ trunk/www/mod_fastcgi/files/patch-fcgi.h 2015-10-31 19:51:13 UTC (rev 20603)
@@ -0,0 +1,97 @@
+--- fcgi.h.orig
++++ fcgi.h
+@@ -57,10 +57,14 @@
+ #define XtOffsetOf APR_OFFSETOF
+ #define ap_select select
+
+-#define ap_user_id unixd_config.user_id
+-#define ap_group_id unixd_config.group_id
+-#define ap_user_name unixd_config.user_name
+-#define ap_suexec_enabled unixd_config.suexec_enabled
++#if MODULE_MAGIC_NUMBER_MAJOR < 20081201
++#define ap_unixd_config unixd_config
++#endif
++
++#define ap_user_id ap_unixd_config.user_id
++#define ap_group_id ap_unixd_config.group_id
++#define ap_user_name ap_unixd_config.user_name
++#define ap_suexec_enabled ap_unixd_config.suexec_enabled
+
+ #ifndef S_ISDIR
+ #define S_ISDIR(m) (((m)&(S_IFMT)) == (S_IFDIR))
+@@ -354,42 +358,42 @@
+ #ifdef APACHE2
+
+ #ifdef WIN32
+-#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError())
+ #else /* !WIN32 */
+-#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
+ #endif
+
+-#define FCGI_LOG_EMERG_ERRNO __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ALERT_ERRNO __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_CRIT_ERRNO __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ERR_ERRNO __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_WARN_ERRNO __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_NOTICE_ERRNO __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_INFO_ERRNO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_DEBUG_ERRNO __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
+-
+-#define FCGI_LOG_EMERG_NOERRNO __FILE__,__LINE__,APLOG_EMERG,0
+-#define FCGI_LOG_ALERT_NOERRNO __FILE__,__LINE__,APLOG_ALERT,0
+-#define FCGI_LOG_CRIT_NOERRNO __FILE__,__LINE__,APLOG_CRIT,0
+-#define FCGI_LOG_ERR_NOERRNO __FILE__,__LINE__,APLOG_ERR,0
+-#define FCGI_LOG_WARN_NOERRNO __FILE__,__LINE__,APLOG_WARNING,0
+-#define FCGI_LOG_NOTICE_NOERRNO __FILE__,__LINE__,APLOG_NOTICE,0
+-#define FCGI_LOG_INFO_NOERRNO __FILE__,__LINE__,APLOG_INFO,0
+-#define FCGI_LOG_DEBUG_NOERRNO __FILE__,__LINE__,APLOG_DEBUG,0
++#define FCGI_LOG_EMERG_ERRNO APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_ALERT_ERRNO APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_CRIT_ERRNO APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_ERR_ERRNO APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_WARN_ERRNO APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_NOTICE_ERRNO APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_INFO_ERRNO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_DEBUG_ERRNO APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
++
++#define FCGI_LOG_EMERG_NOERRNO APLOG_MARK,APLOG_EMERG,0
++#define FCGI_LOG_ALERT_NOERRNO APLOG_MARK,APLOG_ALERT,0
++#define FCGI_LOG_CRIT_NOERRNO APLOG_MARK,APLOG_CRIT,0
++#define FCGI_LOG_ERR_NOERRNO APLOG_MARK,APLOG_ERR,0
++#define FCGI_LOG_WARN_NOERRNO APLOG_MARK,APLOG_WARNING,0
++#define FCGI_LOG_NOTICE_NOERRNO APLOG_MARK,APLOG_NOTICE,0
++#define FCGI_LOG_INFO_NOERRNO APLOG_MARK,APLOG_INFO,0
++#define FCGI_LOG_DEBUG_NOERRNO APLOG_MARK,APLOG_DEBUG,0
+
+ #else /* !APACHE2 */
+
Property changes on: trunk/www/mod_fastcgi/files/patch-fcgi.h
___________________________________________________________________
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
Added: trunk/www/mod_fastcgi/files/patch-fcgi_protocol.c
===================================================================
--- trunk/www/mod_fastcgi/files/patch-fcgi_protocol.c (rev 0)
+++ trunk/www/mod_fastcgi/files/patch-fcgi_protocol.c 2015-10-31 19:51:13 UTC (rev 20603)
@@ -0,0 +1,11 @@
+--- fcgi_protocol.c.orig
++++ fcgi_protocol.c
+@@ -475,7 +475,7 @@
+ 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)(%zu)",
+ fr->fs_path, fr->dataLen, sizeof(FCGI_EndRequestBody));
+ return HTTP_INTERNAL_SERVER_ERROR;
+ }
Property changes on: trunk/www/mod_fastcgi/files/patch-fcgi_protocol.c
___________________________________________________________________
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
Modified: trunk/www/mod_fastcgi/files/patch-fcgi_util.c
===================================================================
--- trunk/www/mod_fastcgi/files/patch-fcgi_util.c 2015-10-31 19:47:50 UTC (rev 20602)
+++ trunk/www/mod_fastcgi/files/patch-fcgi_util.c 2015-10-31 19:51:13 UTC (rev 20603)
@@ -1,5 +1,5 @@
---- fcgi_util.c.orig 2009-07-08 17:16:29.816884000 +0800
-+++ fcgi_util.c 2009-07-09 08:43:09.222180000 +0800
+--- fcgi_util.c.orig
++++ fcgi_util.c
@@ -268,13 +268,17 @@
/* Get the user membership for the file's group. If the
* uid is a member, check the group bits. */
Property changes on: trunk/www/mod_fastcgi/files/patch-fcgi_util.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/mod_fastcgi/files/patch-mod_fastcgi.c
===================================================================
--- trunk/www/mod_fastcgi/files/patch-mod_fastcgi.c 2015-10-31 19:47:50 UTC (rev 20602)
+++ trunk/www/mod_fastcgi/files/patch-mod_fastcgi.c 2015-10-31 19:51:13 UTC (rev 20603)
@@ -1,5 +1,5 @@
---- ./mod_fastcgi.c.orig 2008-11-09 15:31:03.000000000 +0100
-+++ ./mod_fastcgi.c 2013-03-27 18:51:40.000000000 +0100
+--- mod_fastcgi.c.orig
++++ mod_fastcgi.c
@@ -753,6 +753,11 @@
continue;
}
Property changes on: trunk/www/mod_fastcgi/files/patch-mod_fastcgi.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list