From 45edd0b262df2ac13d185d61c1504d9140bf4f45 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Fri, 7 Apr 2006 17:17:53 +0000 Subject: [PATCH] Restore previous URI components decoding instead of unescaping Should fix the old interface - will most likely break the new one (in particular try with non-Latin-1 characters) --- modules/control/http/macro.c | 14 +++++++------- modules/control/http/rpn.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/control/http/macro.c b/modules/control/http/macro.c index 3451c8c9a4..7ea5cf193a 100644 --- a/modules/control/http/macro.c +++ b/modules/control/http/macro.c @@ -236,7 +236,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, { char value[30]; E_(ExtractURIValue)( p_request, "seek_value", value, 30 ); - unescape_URI( value ); + decode_URI( value ); E_(HandleSeek)( p_intf, value ); break; } @@ -248,7 +248,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, E_(ExtractURIValue)( p_request, "value", vol, 8 ); aout_VolumeGet( p_intf, &i_volume ); - unescape_URI( vol ); + decode_URI( vol ); if( vol[0] == '+' ) { @@ -305,9 +305,9 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, playlist_item_t *p_item; E_(ExtractURIValue)( p_request, "mrl", mrl, 1024 ); - unescape_URI( mrl ); + decode_URI( mrl ); E_(ExtractURIValue)( p_request, "name", psz_name, 1024 ); - unescape_URI( psz_name ); + decode_URI( psz_name ); if( !*psz_name ) { memcpy( psz_name, mrl, 1024 ); @@ -530,7 +530,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, char val[512]; E_(ExtractURIValue)( p_request, vlm_properties[i], val, 512 ); - unescape_URI( val ); + decode_URI( val ); if( strlen( val ) > 0 && i >= 4 ) { p += sprintf( p, " %s %s", vlm_properties[i], val ); @@ -626,7 +626,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, if( p_intf->p_sys->p_vlm == NULL ) break; E_(ExtractURIValue)( p_request, "file", file, 512 ); - unescape_URI( file ); + decode_URI( file ); if( E_(StrToMacroType)( control ) == MVLC_VLM_LOAD ) sprintf( psz, "load %s", file ); @@ -661,7 +661,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, break; } E_(ExtractURIValue)( p_request, m->param1, value, 512 ); - unescape_URI( value ); + decode_URI( value ); switch( E_(StrToMacroType)( m->param2 ) ) { diff --git a/modules/control/http/rpn.c b/modules/control/http/rpn.c index 1fa6d0fd02..589ed9e4c6 100644 --- a/modules/control/http/rpn.c +++ b/modules/control/http/rpn.c @@ -353,7 +353,7 @@ void E_(EvaluateRPN)( intf_thread_t *p_intf, mvar_t *vars, char *tmp; E_(ExtractURIValue)( url, name, value, 512 ); - unescape_URI( value ); + decode_URI( value ); tmp = E_(FromUTF8)( p_intf, value ); E_(SSPush)( st, tmp ); free( tmp ); -- 2.39.2