]>
Commit | Line | Data |
---|---|---|
1 | --- ocamlnet-3.6/src/netcgi2-apache/apache.c~ 2012-07-20 01:25:25.000000000 +0200 | |
2 | +++ ocamlnet-3.6/src/netcgi2-apache/apache.c 2013-05-06 09:02:42.545701688 +0200 | |
3 | @@ -212,7 +212,7 @@ | |
4 | raise_not_found (); \ | |
5 | } | |
6 | ||
7 | -CONNECTION(remote_ip) | |
8 | +CONNECTION(client_ip) | |
9 | CONNECTION(remote_host) | |
10 | ||
11 | /*----- Request structure. -----*/ | |
12 | --- ocamlnet-3.6/src/netcgi2-apache/netcgi_apache.ml~ 2012-07-20 01:25:25.000000000 +0200 | |
13 | +++ ocamlnet-3.6/src/netcgi2-apache/netcgi_apache.ml 2013-05-06 09:10:47.898274743 +0200 | |
14 | @@ -469,7 +469,7 @@ | |
15 | method cgi_path_translated = "" (* FIXME: don't know how to get it *) | |
16 | method cgi_auth_type = try Request.auth_type r with Not_found -> "" | |
17 | method cgi_remote_addr = | |
18 | - try Connection.remote_ip(Request.connection r) with Not_found -> "" | |
19 | + try Connection.client_ip(Request.connection r) with Not_found -> "" | |
20 | method cgi_remote_host = | |
21 | try Connection.remote_host(Request.connection r) with Not_found -> "" | |
22 | method cgi_remote_user = try Request.user r with Not_found -> "" | |
23 | --- ocamlnet-3.6/src/netcgi2-apache/netcgi_apache.mli~ 2012-07-20 01:25:25.000000000 +0200 | |
24 | +++ ocamlnet-3.6/src/netcgi2-apache/netcgi_apache.mli 2013-05-06 09:11:14.894941214 +0200 | |
25 | @@ -79,8 +79,8 @@ | |
26 | sig | |
27 | type t (** Apache [conn_rec] structure. *) | |
28 | ||
29 | - external remote_ip : t -> string = "netcgi2_apache_connection_remote_ip" | |
30 | - (** [conn_rec] [remote_ip] field. | |
31 | + external client_ip : t -> string = "netcgi2_apache_connection_client_ip" | |
32 | + (** [conn_rec] [client_ip] field. | |
33 | @raise Not_found if NULL. *) | |
34 | external remote_host : t -> string = "netcgi2_apache_connection_remote_host" | |
35 | (** [conn_rec] [remote_host] field. | |
36 | --- ocamlnet-3.6/src/netcgi2-apache/netcgi_apache_mod.ml.in~ 2012-07-20 01:25:26.000000000 +0200 | |
37 | +++ ocamlnet-3.6/src/netcgi2-apache/netcgi_apache_mod.ml.in 2013-05-06 09:11:43.708274338 +0200 | |
38 | @@ -88,7 +88,7 @@ | |
39 | struct | |
40 | type t (* Actual conn_rec structure. *) | |
41 | ||
42 | - external remote_ip : t -> string = "netcgi2_apache_connection_remote_ip" | |
43 | + external client_ip : t -> string = "netcgi2_apache_connection_client_ip" | |
44 | external remote_host : t -> string = "netcgi2_apache_connection_remote_host" | |
45 | ||
46 | (* ... etc ... *) | |
47 | @@ -237,7 +237,7 @@ | |
48 | let _server_admin = Server.admin | |
49 | let _server_is_virtual = Server.is_virtual | |
50 | ||
51 | - let _connection_remote_ip = Connection.remote_ip | |
52 | + let _connection_client_ip = Connection.client_ip | |
53 | let _connection_remote_host = Connection.remote_host | |
54 | ||
55 | let _request_connection = Request.connection | |
56 | --- ocamlnet-3.6/src/netcgi2-apache/netcgi_apache_mod.mli~ 2012-07-20 01:25:25.000000000 +0200 | |
57 | +++ ocamlnet-3.6/src/netcgi2-apache/netcgi_apache_mod.mli 2013-05-06 09:12:00.441607551 +0200 | |
58 | @@ -57,7 +57,7 @@ | |
59 | module Connection : | |
60 | sig | |
61 | type t (** Apache [conn_rec] structure. *) | |
62 | - external remote_ip : t -> string = "netcgi2_apache_connection_remote_ip" | |
63 | + external client_ip : t -> string = "netcgi2_apache_connection_client_ip" | |
64 | external remote_host : t -> string = "netcgi2_apache_connection_remote_host" | |
65 | end | |
66 |