Commit d20d5294 authored by gerd's avatar gerd

Netamqp_connection: avoiding the dependency on Pcre.

Netamqp_queue.declare_e: fix: in previous versions it
was forgotten to include [arguments] into the message.
This is now done. (Hendrik Tews)



git-svn-id: https://godirepo.camlcity.org/svn/lib-netamqp/trunk@3 e13cfc2c-0730-40e6-b03a-d8ac042e47ad
parent 3962702b
2013-08-15 Gerd Stolpmann <gerd@e130>
* Netamqp_connection: avoiding the dependency on Pcre.
* Netamqp_queue.declare_e: fix: in previous versions it
was forgotten to include [arguments] into the message.
This is now done. (Hendrik Tews)
THIS CHANGELOG STARTS AT RELEASE: netamqp-1.0
......@@ -48,7 +48,8 @@ FILES = \
OMakeroot \
INSTALL \
LICENSE \
README
README \
ChangeLog
GFILES = \
generated/netamqp_methods_0_9.ml \
......
......@@ -46,7 +46,7 @@ $(GEN):
amqp_gen: amqp_gen.ml
ocamlfind ocamlc -package pxp -linkpkg -o amqp_gen amqp_gen.ml
ocamlfind ocamlc -package pxp,pcre -linkpkg -o amqp_gen amqp_gen.ml
doc/html: $(addsuffix .mli, $(FILES)) intro.txt
rm -rf doc/html
......
......@@ -60,6 +60,12 @@ let when_down ep f =
watch()
let split_re = Netstring_str.regexp "[ \t\r\n]+"
let split s =
Netstring_str.split split_re s
let null_uint4 =
Rtypes.uint4_of_int 0
......@@ -98,7 +104,7 @@ let open_e c auth_l lp vhost =
Netlog.logf `Info
"AMQP: connection-start mechs=%s locales=%s"
mechs_s locales;
let mechs_l = Pcre.split mechs_s in
let mechs_l = split mechs_s in
let (auth_s,user,pw) =
try
List.find
......@@ -108,7 +114,7 @@ let open_e c auth_l lp vhost =
| Not_found ->
raise(Error "No suitable authentication methods") in
c.auth_s <- auth_s;
let loc_l = Pcre.split locales in
let loc_l = split locales in
let loc =
match lp with
| `Pref l ->
......
......@@ -54,7 +54,9 @@ let declare_e ~channel ~queue ?(durable=false) ?(exclusive=false)
channel
(`AMQP_0_9
(`Queue_declare
(0, queue, false, durable, exclusive, auto_delete, no_wait, [])))
(0, queue, false, durable, exclusive, auto_delete, no_wait,
arguments
)))
None
++ (fun (m, _) ->
match m with
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment