[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.9.2-3-1-ga982ebb

[Romain Beauxis]

The following commit has been merged in the master branch:
commit a982ebb84c8bf41ac26456dba8c1462b368c2d37
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Thu Jun 10 13:11:22 2010 -0500

    Fixed harbor http get arguments parsing

diff --git a/debian/changelog b/debian/changelog
index d35a2d4..d87ae33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+liquidsoap (0.9.2-4) unstable; urgency=low
+
+  * (TODO) Rebuild against ocaml-ao 0.3.0 for a 
+    correct support of libao4.
+  * Fixed http get arguments parsing in harbor.ml 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Thu, 10 Jun 2010 13:10:13 -0500
+
 liquidsoap (0.9.2-3) unstable; urgency=low
 
   * Fixed ogg theora default parameters.
diff --git a/debian/patches/fix_harbor_get_args.patch b/debian/patches/fix_harbor_get_args.patch
new file mode 100644
index 0000000..756e33b
--- /dev/null
+++ b/debian/patches/fix_harbor_get_args.patch
@@ -0,0 +1,21 @@
+Index: liquidsoap/src/tools/harbor.ml
+===================================================================
+--- liquidsoap.orig/src/tools/harbor.ml	2009-10-30 15:35:23.000000000 -0500
++++ liquidsoap/src/tools/harbor.ml	2010-06-10 13:09:30.000000000 -0500
+@@ -391,7 +391,15 @@
+     | Not_found -> uri,""
+   in
+   log#f 3 "GET request on %s." base_uri ;
+-  let args = Http.args_split (Http.url_decode args) in
++  let args = Http.args_split args in
++  (* decode args *)
++  let args = 
++    let ret = Hashtbl.create (Hashtbl.length args) in
++    let g = Http.url_decode in
++    let f x y = Hashtbl.add ret (g x) (g y) in 
++    Hashtbl.iter f args ;
++    ret
++  in
+   (* Filter out password *)
+   let log_args = 
+     if conf_pass_verbose#get then
diff --git a/debian/patches/series b/debian/patches/series
index 4c468ba..b3acfdb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ theora_0.2.0_fix.patch
 move_portaudio_low_in_in.patch
 replay_gain_quiet_mode.patch
 fix_lastfm_input.patch
+fix_harbor_get_args.patch

-- 
liquidsoap packaging