1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
From: Mehdi Dogguy <mehdi@debian.org>
Date: Fri, 16 Oct 2015 23:36:37 +0200
Subject: Compile with ocamlnet 4.0.4
---
META | 2 +-
Makefile | 4 ++--
XmlRpc.ml | 8 ++++----
examples/adder/Makefile | 2 +-
test/test.ml | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/META b/META
index 9e153c9..befe597 100644
--- a/META
+++ b/META
@@ -1,6 +1,6 @@
name = "xmlrpc-light"
version = "0.6.1"
description = "XML-RPC client based on Xml-Light"
-requires = "xml-light,netclient,nethttpd-for-netcgi2"
+requires = "xml-light,netclient,nethttpd"
archive(byte) = "xmlrpc-light.cma"
archive(native) = "xmlrpc-light.cmxa"
diff --git a/Makefile b/Makefile
index e7dee0b..5540de5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@ OCAMLMAKEFILE = OCamlMakefile
RESULT = xmlrpc-light
SOURCES = XmlRpcBase64.mli XmlRpcBase64.ml XmlRpcDateTime.mli XmlRpcDateTime.ml XmlRpc.mli XmlRpc.ml XmlRpcServer.mli XmlRpcServer.ml
-PACKS = xml-light,netclient,nethttpd-for-netcgi2
+PACKS = xml-light,netclient,nethttpd
LIBINSTALL_FILES = XmlRpcBase64.mli XmlRpcBase64.cmi XmlRpcDateTime.mli XmlRpcDateTime.cmi XmlRpc.mli XmlRpc.cmi XmlRpcServer.mli XmlRpcServer.cmi xmlrpc-light.cma xmlrpc-light.cmxa xmlrpc-light.a
-OCAMLDOC = ocamlfind ocamldoc -package xml-light,nethttpd-for-netcgi2
+OCAMLDOC = ocamlfind ocamldoc -package xml-light,nethttpd
DOC_FILES = XmlRpcBase64.mli XmlRpcDateTime.mli XmlRpc.mli XmlRpcServer.mli
all: native-code-library byte-code-library
diff --git a/XmlRpc.ml b/XmlRpc.ml
index b398318..9d81a79 100644
--- a/XmlRpc.ml
+++ b/XmlRpc.ml
@@ -414,7 +414,7 @@ object (self)
Neturl.string_of_url
(Neturl.remove_from_url ~user:true ~password:true parsed_url) in
- let call = new Http_client.post_raw url xml in
+ let call = new Nethttp_client.post_raw url xml in
call#set_req_header "User-Agent" useragent;
call#set_req_header "Content-Type" "text/xml";
List.iter (fun (n, v) -> call#set_req_header n v) headers;
@@ -428,12 +428,12 @@ object (self)
| None -> ()
end;
- let pipeline = new Http_client.pipeline in
+ let pipeline = new Nethttp_client.pipeline in
pipeline#set_proxy_from_environment ();
let opt = pipeline#get_options in
pipeline#set_options
- {opt with Http_client.
+ {opt with Nethttp_client.
connection_timeout = timeout;
};
@@ -441,7 +441,7 @@ object (self)
begin
let opt = pipeline#get_options in
pipeline#set_options
- {opt with Http_client.
+ {opt with Nethttp_client.
verbose_status = true;
verbose_request_header = true;
verbose_response_header = true;
diff --git a/examples/adder/Makefile b/examples/adder/Makefile
index 0504c93..4ef2ec3 100644
--- a/examples/adder/Makefile
+++ b/examples/adder/Makefile
@@ -2,7 +2,7 @@ OCAMLMAKEFILE = OCamlMakefile
RESULT = adder
SOURCES = adder.ml
-PACKS = xmlrpc-light,nethttpd-for-netcgi2
+PACKS = xmlrpc-light,nethttpd
all: native-code
diff --git a/test/test.ml b/test/test.ml
index f1c919d..48e6400 100644
--- a/test/test.ml
+++ b/test/test.ml
@@ -21,7 +21,7 @@
#require "oUnit";;
#require "netclient";;
-#require "nethttpd-for-netcgi2";;
+#require "nethttpd";;
#require "xml-light";;
#load "xmlrpc-light.cma";;
|
