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