]>
Commit | Line | Data |
---|---|---|
27ecd3ca JR |
1 | --- mod_python-3.3.1/src/mod_python.c~ 2006-11-09 07:21:23.000000000 +0100 |
2 | +++ mod_python-3.3.1/src/mod_python.c 2013-05-05 21:57:30.378136612 +0200 | |
3 | @@ -561,8 +561,8 @@ | |
4 | ||
5 | #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE) | |
6 | if (!geteuid()) { | |
7 | - chown(fname, unixd_config.user_id, -1); | |
8 | - unixd_set_global_mutex_perms(mutex[n]); | |
9 | + chown(fname, ap_unixd_config.user_id, -1); | |
10 | + ap_unixd_set_global_mutex_perms(mutex[n]); | |
11 | } | |
12 | #endif | |
13 | } | |
14 | --- mod_python-3.3.1/src/serverobject.c~ 2006-12-03 05:36:37.000000000 +0100 | |
15 | +++ mod_python-3.3.1/src/serverobject.c 2013-05-05 22:53:26.721477649 +0200 | |
16 | @@ -191,7 +191,7 @@ | |
17 | {"server_hostname", T_STRING, OFF(server_hostname)}, | |
18 | {"port", T_SHORT, OFF(port)}, | |
19 | {"error_fname", T_STRING, OFF(error_fname)}, | |
20 | - {"loglevel", T_INT, OFF(loglevel)}, | |
21 | + {"loglevel", T_INT, OFF(log.level)}, | |
22 | {"is_virtual", T_INT, OFF(is_virtual)}, | |
23 | /* XXX implement module_config ? */ | |
24 | /* XXX implement lookup_defaults ? */ | |
25 | @@ -288,7 +288,9 @@ | |
26 | ||
27 | static PyObject *my_generation(serverobject *self, void *objname) | |
28 | { | |
29 | - return PyInt_FromLong((long)ap_my_generation); | |
30 | + ap_generation_t mpm_generation; | |
31 | + ap_mpm_query(AP_MPMQ_GENERATION, &mpm_generation); | |
32 | + return PyInt_FromLong((long)mpm_generation); | |
33 | } | |
34 | ||
35 | static PyObject *restart_time(serverobject *self, void *objname) | |
36 | --- mod_python-3.3.1/src/connobject.c.orig 2013-05-05 23:03:40.876114437 +0200 | |
37 | +++ mod_python-3.3.1/src/connobject.c 2013-05-05 23:10:10.889444946 +0200 | |
38 | @@ -286,8 +286,10 @@ | |
39 | /* XXX vhost_lookup_data? */ | |
40 | /* XXX client_socket? */ | |
41 | {"local_addr", T_OBJECT, 0, RO}, | |
42 | + {"client_addr", T_OBJECT, 0, RO}, | |
43 | {"remote_addr", T_OBJECT, 0, RO}, | |
44 | - {"remote_ip", T_STRING, OFF(remote_ip), RO}, | |
45 | + {"client_ip", T_STRING, OFF(client_ip), RO}, | |
46 | + {"remote_ip", T_STRING, OFF(client_ip), RO}, | |
47 | {"remote_host", T_STRING, OFF(remote_host), RO}, | |
48 | {"remote_logname", T_STRING, OFF(remote_logname), RO}, | |
49 | {"aborted", T_INT, 0, RO}, | |
50 | @@ -414,8 +416,11 @@ | |
51 | else if (strcmp(name, "local_addr") == 0) { | |
52 | return makesockaddr(self->conn->local_addr); | |
53 | } | |
54 | + else if (strcmp(name, "client_addr") == 0) { | |
55 | + return makesockaddr(self->conn->client_addr); | |
56 | + } | |
57 | else if (strcmp(name, "remote_addr") == 0) { | |
58 | - return makesockaddr(self->conn->remote_addr); | |
59 | + return makesockaddr(self->conn->client_addr); | |
60 | } | |
61 | else if (strcmp(name, "notes") == 0) { | |
62 | Py_INCREF(self->notes); |