Attachment 134959 Details for Bug 179710 – file.diff

[patch] file.diff

file.diff (text/plain), 6.77 KB, created by Harald Schmalzbauer on 2013-06-19 10:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Schmalzbauer

Created: 2013-06-19 10:10:01 UTC

Size: 6.77 KB

patch

obsolete

>--- ports/www/mod_fastcgi/Makefile.orig	2013-06-19 08:09:43.435419733 +0000
>+++ ports/www/mod_fastcgi/Makefile	2013-06-19 08:09:48.161416625 +0000
>@@ -14,7 +14,7 @@
> 
> MAKE_JOBS_SAFE=	yes
> 
>-USE_APACHE=	22
>+USE_APACHE=	22+
> AP_FAST_BUILD=	yes
> AP_GENPLIST=	yes
> SRC_FILE=	*.c
>--- /dev/null	2013-06-19 08:11:00.000000000 +0000
>+++ ports/www/mod_fastcgi/files/patch-build24.diff	2013-06-19 08:07:31.946416573 +0000
>@@ -0,0 +1,133 @@
>+--- fcgi.h.orig	2008-09-22 10:36:06.000000000 +0000
>++++ fcgi.h	2013-06-19 08:06:28.000000000 +0000
>+@@ -34,6 +34,10 @@
>+ #define APACHE2
>+ #endif
>+ 
>++#ifdef AP_DECLARE_MODULE
>++#define APACHE24
>++#endif
>++
>+ #ifdef APACHE2
>+ 
>+ #include <sys/stat.h>
>+@@ -57,10 +61,16 @@
>+ #define XtOffsetOf APR_OFFSETOF
>+ #define ap_select select
>+ 
>++#ifdef APACHE24
>++#define unixd_config ap_unixd_config
>++#endif
>++
>++#ifdef APACHE2
>+ #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
>++#endif
>+ 
>+ #ifndef S_ISDIR
>+ #define S_ISDIR(m)      (((m)&(S_IFMT)) == (S_IFDIR))
>+@@ -354,42 +364,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)
>+-#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 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 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 */
>+ 
>+--- mod_fastcgi.c.orig	2013-06-19 08:01:23.000000000 +0000
>++++ mod_fastcgi.c	2013-06-19 08:06:28.000000000 +0000
>+@@ -97,6 +97,10 @@
>+ } while (0)
>+ #endif
>+ 
>++#ifdef APACHE24
>++module AP_MODULE_DECLARE_DATA fastcgi_module;
>++#endif
>++
>+ /*
>+  * Global variables
>+  */
>+@@ -3014,7 +3018,11 @@
>+     ap_hook_fixups(fixups, NULL, NULL, APR_HOOK_MIDDLE); 
>+ }
>+ 
>++#ifdef APACHE24
>++AP_DECLARE_MODULE(fastcgi) =
>++#else
>+ module AP_MODULE_DECLARE_DATA fastcgi_module =
>++#endif
>+ {
>+     STANDARD20_MODULE_STUFF,
>+     fcgi_config_create_dir_config,  /* per-directory config creator */

Actions: View | Diff

Attachments on bug 179710: 134959 | 134960