projects / packages / apache-mod_mono.git / blame
| Commit | Line | Data |
|---|---|---|
| e0465780 JR |
1 | diff -ur mod_mono-2.10/configure.in mod_mono-2.10-apache24/configure.in |
| 2 | --- mod_mono-2.10/configure.in 2013-05-05 21:17:12.794820781 +0200 | |
| 3 | +++ mod_mono-2.10-apache24/configure.in 2013-05-05 21:14:23.924822003 +0200 | |
| 4 | @@ -330,7 +330,7 @@ | |
| 5 | #include <ap_release.h> | |
| 6 | int main () | |
| 7 | { | |
| 8 | - return (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER == 2) ? 0 : 1; | |
| 9 | + return (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER >= 2) ? 0 : 1; | |
| 10 | } | |
| 11 | ], [ | |
| 12 | APACHE_VER=2.2 | |
| 13 | diff -ur mod_mono-2.10/src/mod_mono.c mod_mono-2.10-apache24/src/mod_mono.c | |
| 14 | --- mod_mono-2.10/src/mod_mono.c 2011-01-13 23:32:35.000000000 +0100 | |
| 15 | +++ mod_mono-2.10-apache24/src/mod_mono.c 2013-05-05 21:16:46.081487640 +0200 | |
| 16 | @@ -386,7 +386,7 @@ | |
| 17 | apache_get_userid () | |
| 18 | { | |
| 19 | #ifdef HAVE_UNIXD | |
| 20 | - return unixd_config.user_id; | |
| 21 | + return ap_unixd_config.user_id; | |
| 22 | #else | |
| 23 | return ap_user_id; | |
| 24 | #endif | |
| 25 | @@ -396,7 +396,7 @@ | |
| 26 | apache_get_groupid () | |
| 27 | { | |
| 28 | #ifdef HAVE_UNIXD | |
| 29 | - return unixd_config.group_id; | |
| 30 | + return ap_unixd_config.group_id; | |
| 31 | #else | |
| 32 | return ap_group_id; | |
| 33 | #endif | |
| 34 | @@ -406,7 +406,7 @@ | |
| 35 | apache_get_username () | |
| 36 | { | |
| 37 | #ifdef HAVE_UNIXD | |
| 38 | - return unixd_config.user_name; | |
| 39 | + return ap_unixd_config.user_name; | |
| 40 | #else | |
| 41 | return ap_user_name; | |
| 42 | #endif | |
| 43 | @@ -485,7 +485,7 @@ | |
| 44 | ||
| 45 | #if defined (AP_NEED_SET_MUTEX_PERMS) && defined (HAVE_UNIXD) | |
| 46 | DEBUG_PRINT (1, "Setting mutex permissions for %s", xsp->dashboard_lock_file); | |
| 47 | - rv = unixd_set_global_mutex_perms (xsp->dashboard_mutex); | |
| 48 | + rv = ap_unixd_set_global_mutex_perms (xsp->dashboard_mutex); | |
| 49 | if (rv != APR_SUCCESS) { | |
| 50 | ap_log_error (APLOG_MARK, APLOG_CRIT, STATCODE_AND_SERVER (rv), | |
| 51 | "Failed to set mutex permissions for %s", | |
| 52 | @@ -845,10 +845,10 @@ | |
| 53 | } | |
| 54 | ||
| 55 | static int | |
| 56 | -connection_get_remote_port (conn_rec *c) | |
| 57 | +connection_get_remote_port (request_rec *r) | |
| 58 | { | |
| 59 | #if defined(APACHE22) | |
| 60 | - return c->remote_addr->port; | |
| 61 | + return r->useragent_addr->port; | |
| 62 | #else | |
| 63 | apr_port_t port; | |
| 64 | apr_sockaddr_port_get (&port, c->remote_addr); | |
| 65 | @@ -1978,7 +1978,7 @@ | |
| 66 | ||
| 67 | size += sizeof (int32_t); | |
| 68 | ||
| 69 | - info.remote_ip_len = strlen (r->connection->remote_ip); | |
| 70 | + info.remote_ip_len = strlen (r->connection->client_ip); | |
| 71 | size += info.remote_ip_len + sizeof (int32_t); | |
| 72 | ||
| 73 | size += sizeof (int32_t); | |
| 74 | @@ -2026,8 +2026,8 @@ | |
| 75 | i = LE_FROM_INT (i); | |
| 76 | memcpy (ptr, &i, sizeof (i)); | |
| 77 | ptr += sizeof (int32_t); | |
| 78 | - ptr += write_string_to_buffer (ptr, 0, r->connection->remote_ip, info.remote_ip_len); | |
| 79 | - i = connection_get_remote_port (r->connection); | |
| 80 | + ptr += write_string_to_buffer (ptr, 0, r->connection->client_ip, info.remote_ip_len); | |
| 81 | + i = connection_get_remote_port (r); | |
| 82 | i = LE_FROM_INT (i); | |
| 83 | memcpy (ptr, &i, sizeof (i)); | |
| 84 | ptr += sizeof (int32_t); |