Commit 45edd0b2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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)
parent 5b315d73
...@@ -236,7 +236,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, ...@@ -236,7 +236,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
{ {
char value[30]; char value[30];
E_(ExtractURIValue)( p_request, "seek_value", value, 30 ); E_(ExtractURIValue)( p_request, "seek_value", value, 30 );
unescape_URI( value ); decode_URI( value );
E_(HandleSeek)( p_intf, value ); E_(HandleSeek)( p_intf, value );
break; break;
} }
...@@ -248,7 +248,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, ...@@ -248,7 +248,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
E_(ExtractURIValue)( p_request, "value", vol, 8 ); E_(ExtractURIValue)( p_request, "value", vol, 8 );
aout_VolumeGet( p_intf, &i_volume ); aout_VolumeGet( p_intf, &i_volume );
unescape_URI( vol ); decode_URI( vol );
if( vol[0] == '+' ) if( vol[0] == '+' )
{ {
...@@ -305,9 +305,9 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, ...@@ -305,9 +305,9 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
playlist_item_t *p_item; playlist_item_t *p_item;
E_(ExtractURIValue)( p_request, "mrl", mrl, 1024 ); E_(ExtractURIValue)( p_request, "mrl", mrl, 1024 );
unescape_URI( mrl ); decode_URI( mrl );
E_(ExtractURIValue)( p_request, "name", psz_name, 1024 ); E_(ExtractURIValue)( p_request, "name", psz_name, 1024 );
unescape_URI( psz_name ); decode_URI( psz_name );
if( !*psz_name ) if( !*psz_name )
{ {
memcpy( psz_name, mrl, 1024 ); memcpy( psz_name, mrl, 1024 );
...@@ -530,7 +530,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, ...@@ -530,7 +530,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
char val[512]; char val[512];
E_(ExtractURIValue)( p_request, E_(ExtractURIValue)( p_request,
vlm_properties[i], val, 512 ); vlm_properties[i], val, 512 );
unescape_URI( val ); decode_URI( val );
if( strlen( val ) > 0 && i >= 4 ) if( strlen( val ) > 0 && i >= 4 )
{ {
p += sprintf( p, " %s %s", vlm_properties[i], val ); p += sprintf( p, " %s %s", vlm_properties[i], val );
...@@ -626,7 +626,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, ...@@ -626,7 +626,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
if( p_intf->p_sys->p_vlm == NULL ) break; if( p_intf->p_sys->p_vlm == NULL ) break;
E_(ExtractURIValue)( p_request, "file", file, 512 ); E_(ExtractURIValue)( p_request, "file", file, 512 );
unescape_URI( file ); decode_URI( file );
if( E_(StrToMacroType)( control ) == MVLC_VLM_LOAD ) if( E_(StrToMacroType)( control ) == MVLC_VLM_LOAD )
sprintf( psz, "load %s", file ); sprintf( psz, "load %s", file );
...@@ -661,7 +661,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, ...@@ -661,7 +661,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
break; break;
} }
E_(ExtractURIValue)( p_request, m->param1, value, 512 ); E_(ExtractURIValue)( p_request, m->param1, value, 512 );
unescape_URI( value ); decode_URI( value );
switch( E_(StrToMacroType)( m->param2 ) ) switch( E_(StrToMacroType)( m->param2 ) )
{ {
......
...@@ -353,7 +353,7 @@ void E_(EvaluateRPN)( intf_thread_t *p_intf, mvar_t *vars, ...@@ -353,7 +353,7 @@ void E_(EvaluateRPN)( intf_thread_t *p_intf, mvar_t *vars,
char *tmp; char *tmp;
E_(ExtractURIValue)( url, name, value, 512 ); E_(ExtractURIValue)( url, name, value, 512 );
unescape_URI( value ); decode_URI( value );
tmp = E_(FromUTF8)( p_intf, value ); tmp = E_(FromUTF8)( p_intf, value );
E_(SSPush)( st, tmp ); E_(SSPush)( st, tmp );
free( tmp ); free( tmp );
......
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