[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr... |
Date: |
Sat, 17 Mar 2007 18:49:33 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 07/03/17 18:49:33
Modified files:
distrib : ChangeLog
src/daemon/driver: driverControlers.ml
src/utils/lib : url.ml url.mli
Log message:
patch #5775
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1208&r2=1.1209
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/url.ml?cvsroot=mldonkey&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/url.mli?cvsroot=mldonkey&r1=1.4&r2=1.5
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1208
retrieving revision 1.1209
diff -u -b -r1.1208 -r1.1209
--- distrib/ChangeLog 17 Mar 2007 18:03:01 -0000 1.1208
+++ distrib/ChangeLog 17 Mar 2007 18:49:32 -0000 1.1209
@@ -15,6 +15,7 @@
=========
2007/03/17
+5775: http_client: Fix loading URLs with ()' (orbit)
5781: web_infos: Load local file if remote file can not be accessed
(thx to xergius)
5802: Telnet: Support non-ascii input (Hung-Te Lin)
Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- src/daemon/driver/driverControlers.ml 17 Mar 2007 15:24:44 -0000
1.100
+++ src/daemon/driver/driverControlers.ml 17 Mar 2007 18:49:32 -0000
1.101
@@ -103,7 +103,7 @@
let eval auth cmd o =
let buf = o.conn_buf in
- let cmd = Url.decode cmd in
+ let cmd = Url.decode ~raw:false cmd in
let cmd =
if String2.check_prefix cmd "ed2k://" ||
String2.check_prefix cmd "ftp://" ||
Index: src/utils/lib/url.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/url.ml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/utils/lib/url.ml 11 Mar 2007 18:51:28 -0000 1.8
+++ src/utils/lib/url.ml 17 Mar 2007 18:49:32 -0000 1.9
@@ -32,7 +32,7 @@
string : string;
}
-(* encode using x-www-form-urlencoded form *)
+(* encode using RFC 1738 form *)
let encode s =
let pos = ref 0 in
let len = String.length s in
@@ -42,9 +42,8 @@
else Char.chr (Char.code '0' + x) in
for i=0 to len-1 do
match s.[i] with
- | 'a'..'z' | 'A'..'Z' | '0'..'9' | '.' | '-' | '*' | '_' ->
+ | 'a'..'z' | 'A'..'Z' | '0'..'9' | '.' | '-' | '*' | '_' | '\''| '(' |
')'->
res.[!pos] <- s.[i]; incr pos
-(* | ' ' -> res.[!pos] <- '+'; incr pos *)
| c ->
res.[!pos] <- '%';
res.[!pos+1] <- hexa_digit (Char.code c / 16);
@@ -53,28 +52,22 @@
done;
String.sub res 0 !pos
-(* decode using x-www-form-urlencoded form *)
-
-let digit_hexa x =
- match x with
- | 'a' .. 'f' -> (Char.code x) + 10 - (Char.code 'a')
- | 'A' .. 'F' -> (Char.code x) + 10 - (Char.code 'A')
- | '0' .. '9' -> (Char.code x) - (Char.code '0')
- | _ -> failwith "Not an hexa number (encode.ml)"
-
-let decode s =
+(** decodes a sting according RFC 1738
+or x-www-form-urlencoded ('+' with ' ')
+ @param raw true use RFC 1738
+ @param string string to decode
+*)
+let decode ?(raw=true) s =
let len = String.length s in
let r = Buffer.create len in
let rec iter i =
if i < len then
match s.[i] with
- | '+' -> Buffer.add_char r ' '; iter (i+1)
| '%' ->
let n =
try
- let fst = digit_hexa s.[i+1] in
- let snd = digit_hexa s.[i+2] in
- Buffer.add_char r (char_of_int (fst*16 + snd));
+ (* int_of_string with leading "0x", string is read hexadecimal *)
+ Buffer.add_char r (char_of_int (int_of_string ("0x" ^
(String.sub s (i+1) 2))));
3
with _ ->
Buffer.add_char r '%';
@@ -82,6 +75,10 @@
in
iter (i+n)
+ (* if not raw decode '+' -> ' ' else don't change char *)
+ | '+' -> let c = if raw then '+' else ' ' in
+ Buffer.add_char r c; iter (i+1)
+
| c -> Buffer.add_char r c; iter (i+1)
in
iter 0;
@@ -117,7 +114,7 @@
let args = String2.split url_end '&' in
List.map (fun s ->
let (name, value) = String2.cut_at s '=' in
- decode name, decode value
+ decode ~raw:false name, decode ~raw:false value
) args
let create proto user passwd server port full_file =
Index: src/utils/lib/url.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/url.mli,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/utils/lib/url.mli 11 Mar 2007 18:51:28 -0000 1.4
+++ src/utils/lib/url.mli 17 Mar 2007 18:49:32 -0000 1.5
@@ -54,7 +54,7 @@
val encode : string -> string
-val decode : string -> string
+val decode : ?raw:bool -> string -> string
val option : url Options.option_class
\ No newline at end of file