Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
39401d06
Commit
39401d06
authored
Nov 11, 2006
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Unicode wrappers to open HTTP interface files
parent
2beb123a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
modules/control/http/http.c
modules/control/http/http.c
+1
-2
modules/control/http/util.c
modules/control/http/util.c
+3
-4
No files found.
modules/control/http/http.c
View file @
39401d06
...
...
@@ -639,8 +639,7 @@ int E_(HttpCallback)( httpd_file_sys_t *p_args,
char
**
pp_data
=
(
char
**
)
_pp_data
;
FILE
*
f
;
/* FIXME: do we need character encoding translation here? */
if
(
(
f
=
fopen
(
p_args
->
file
,
"r"
)
)
==
NULL
)
if
(
(
f
=
utf8_fopen
(
p_args
->
file
,
"r"
)
)
==
NULL
)
{
Callback404
(
p_args
,
pp_data
,
pi_data
);
return
VLC_SUCCESS
;
...
...
modules/control/http/util.c
View file @
39401d06
...
...
@@ -213,11 +213,10 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
httpd_file_sys_t
*
f
=
NULL
;
httpd_handler_sys_t
*
h
=
NULL
;
vlc_bool_t
b_index
;
char
*
psz_file
,
*
psz_name
,
*
psz_ext
;
char
*
psz_name
,
*
psz_ext
;
psz_file
=
E_
(
FromUTF8
)(
p_intf
,
dir
);
psz_name
=
E_
(
FileToUrl
)(
&
dir
[
strlen
(
psz_root
)],
&
b_index
);
psz_ext
=
strrchr
(
psz_file
,
'.'
);
psz_ext
=
strrchr
(
dir
,
'.'
);
if
(
psz_ext
!=
NULL
)
{
int
i
;
...
...
@@ -243,7 +242,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
f
->
p_file
=
NULL
;
f
->
p_redir
=
NULL
;
f
->
p_redir2
=
NULL
;
f
->
file
=
psz_file
;
f
->
file
=
strdup
(
dir
)
;
f
->
name
=
psz_name
;
f
->
b_html
=
strstr
(
&
dir
[
strlen
(
psz_root
)],
".htm"
)
||
strstr
(
&
dir
[
strlen
(
psz_root
)],
".xml"
)
?
VLC_TRUE
:
VLC_FALSE
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment