|
Added
Link Here
|
| 1 |
--- fcgi.h.orig 2008-09-22 10:36:06.000000000 +0000 |
| 2 |
+++ fcgi.h 2013-06-19 08:06:28.000000000 +0000 |
| 3 |
@@ -34,6 +34,10 @@ |
| 4 |
#define APACHE2 |
| 5 |
#endif |
| 6 |
|
| 7 |
+#ifdef AP_DECLARE_MODULE |
| 8 |
+#define APACHE24 |
| 9 |
+#endif |
| 10 |
+ |
| 11 |
#ifdef APACHE2 |
| 12 |
|
| 13 |
#include <sys/stat.h> |
| 14 |
@@ -57,10 +61,16 @@ |
| 15 |
#define XtOffsetOf APR_OFFSETOF |
| 16 |
#define ap_select select |
| 17 |
|
| 18 |
+#ifdef APACHE24 |
| 19 |
+#define unixd_config ap_unixd_config |
| 20 |
+#endif |
| 21 |
+ |
| 22 |
+#ifdef APACHE2 |
| 23 |
#define ap_user_id unixd_config.user_id |
| 24 |
#define ap_group_id unixd_config.group_id |
| 25 |
#define ap_user_name unixd_config.user_name |
| 26 |
#define ap_suexec_enabled unixd_config.suexec_enabled |
| 27 |
+#endif |
| 28 |
|
| 29 |
#ifndef S_ISDIR |
| 30 |
#define S_ISDIR(m) (((m)&(S_IFMT)) == (S_IFDIR)) |
| 31 |
@@ -354,42 +364,42 @@ |
| 32 |
#ifdef APACHE2 |
| 33 |
|
| 34 |
#ifdef WIN32 |
| 35 |
-#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError()) |
| 36 |
-#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError()) |
| 37 |
-#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError()) |
| 38 |
-#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError()) |
| 39 |
-#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError()) |
| 40 |
-#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError()) |
| 41 |
-#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError()) |
| 42 |
-#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError()) |
| 43 |
+#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError()) |
| 44 |
+#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError()) |
| 45 |
+#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError()) |
| 46 |
+#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError()) |
| 47 |
+#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError()) |
| 48 |
+#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError()) |
| 49 |
+#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError()) |
| 50 |
+#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError()) |
| 51 |
#else /* !WIN32 */ |
| 52 |
-#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno) |
| 53 |
-#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno) |
| 54 |
-#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno) |
| 55 |
-#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno) |
| 56 |
-#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno) |
| 57 |
-#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) |
| 58 |
-#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno) |
| 59 |
-#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) |
| 60 |
-#endif |
| 61 |
- |
| 62 |
-#define FCGI_LOG_EMERG_ERRNO __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno) |
| 63 |
-#define FCGI_LOG_ALERT_ERRNO __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno) |
| 64 |
-#define FCGI_LOG_CRIT_ERRNO __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno) |
| 65 |
-#define FCGI_LOG_ERR_ERRNO __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno) |
| 66 |
-#define FCGI_LOG_WARN_ERRNO __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno) |
| 67 |
-#define FCGI_LOG_NOTICE_ERRNO __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) |
| 68 |
-#define FCGI_LOG_INFO_ERRNO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno) |
| 69 |
-#define FCGI_LOG_DEBUG_ERRNO __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) |
| 70 |
- |
| 71 |
-#define FCGI_LOG_EMERG_NOERRNO __FILE__,__LINE__,APLOG_EMERG,0 |
| 72 |
-#define FCGI_LOG_ALERT_NOERRNO __FILE__,__LINE__,APLOG_ALERT,0 |
| 73 |
-#define FCGI_LOG_CRIT_NOERRNO __FILE__,__LINE__,APLOG_CRIT,0 |
| 74 |
-#define FCGI_LOG_ERR_NOERRNO __FILE__,__LINE__,APLOG_ERR,0 |
| 75 |
-#define FCGI_LOG_WARN_NOERRNO __FILE__,__LINE__,APLOG_WARNING,0 |
| 76 |
-#define FCGI_LOG_NOTICE_NOERRNO __FILE__,__LINE__,APLOG_NOTICE,0 |
| 77 |
-#define FCGI_LOG_INFO_NOERRNO __FILE__,__LINE__,APLOG_INFO,0 |
| 78 |
-#define FCGI_LOG_DEBUG_NOERRNO __FILE__,__LINE__,APLOG_DEBUG,0 |
| 79 |
+#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno) |
| 80 |
+#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno) |
| 81 |
+#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno) |
| 82 |
+#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno) |
| 83 |
+#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno) |
| 84 |
+#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) |
| 85 |
+#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno) |
| 86 |
+#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) |
| 87 |
+#endif |
| 88 |
+ |
| 89 |
+#define FCGI_LOG_EMERG_ERRNO APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno) |
| 90 |
+#define FCGI_LOG_ALERT_ERRNO APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno) |
| 91 |
+#define FCGI_LOG_CRIT_ERRNO APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno) |
| 92 |
+#define FCGI_LOG_ERR_ERRNO APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno) |
| 93 |
+#define FCGI_LOG_WARN_ERRNO APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno) |
| 94 |
+#define FCGI_LOG_NOTICE_ERRNO APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) |
| 95 |
+#define FCGI_LOG_INFO_ERRNO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno) |
| 96 |
+#define FCGI_LOG_DEBUG_ERRNO APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) |
| 97 |
+ |
| 98 |
+#define FCGI_LOG_EMERG_NOERRNO APLOG_MARK,APLOG_EMERG,0 |
| 99 |
+#define FCGI_LOG_ALERT_NOERRNO APLOG_MARK,APLOG_ALERT,0 |
| 100 |
+#define FCGI_LOG_CRIT_NOERRNO APLOG_MARK,APLOG_CRIT,0 |
| 101 |
+#define FCGI_LOG_ERR_NOERRNO APLOG_MARK,APLOG_ERR,0 |
| 102 |
+#define FCGI_LOG_WARN_NOERRNO APLOG_MARK,APLOG_WARNING,0 |
| 103 |
+#define FCGI_LOG_NOTICE_NOERRNO APLOG_MARK,APLOG_NOTICE,0 |
| 104 |
+#define FCGI_LOG_INFO_NOERRNO APLOG_MARK,APLOG_INFO,0 |
| 105 |
+#define FCGI_LOG_DEBUG_NOERRNO APLOG_MARK,APLOG_DEBUG,0 |
| 106 |
|
| 107 |
#else /* !APACHE2 */ |
| 108 |
|
| 109 |
--- mod_fastcgi.c.orig 2013-06-19 08:01:23.000000000 +0000 |
| 110 |
+++ mod_fastcgi.c 2013-06-19 08:06:28.000000000 +0000 |
| 111 |
@@ -97,6 +97,10 @@ |
| 112 |
} while (0) |
| 113 |
#endif |
| 114 |
|
| 115 |
+#ifdef APACHE24 |
| 116 |
+module AP_MODULE_DECLARE_DATA fastcgi_module; |
| 117 |
+#endif |
| 118 |
+ |
| 119 |
/* |
| 120 |
* Global variables |
| 121 |
*/ |
| 122 |
@@ -3014,7 +3018,11 @@ |
| 123 |
ap_hook_fixups(fixups, NULL, NULL, APR_HOOK_MIDDLE); |
| 124 |
} |
| 125 |
|
| 126 |
+#ifdef APACHE24 |
| 127 |
+AP_DECLARE_MODULE(fastcgi) = |
| 128 |
+#else |
| 129 |
module AP_MODULE_DECLARE_DATA fastcgi_module = |
| 130 |
+#endif |
| 131 |
{ |
| 132 |
STANDARD20_MODULE_STUFF, |
| 133 |
fcgi_config_create_dir_config, /* per-directory config creator */ |