Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
002135d9
Commit
002135d9
authored
May 29, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HTTP access: use var_Inherit*()
parent
6b35f6ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
modules/access/http.c
modules/access/http.c
+8
-8
No files found.
modules/access/http.c
View file @
002135d9
...
@@ -247,7 +247,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -247,7 +247,7 @@ static int Open( vlc_object_t *p_this )
{
{
access_t
*
p_access
=
(
access_t
*
)
p_this
;
access_t
*
p_access
=
(
access_t
*
)
p_this
;
return
OpenWithCookies
(
p_this
,
p_access
->
psz_access
,
0
,
return
OpenWithCookies
(
p_this
,
p_access
->
psz_access
,
0
,
var_
CreateGe
tInteger
(
p_access
,
"http-max-redirect"
),
NULL
);
var_
Inheri
tInteger
(
p_access
,
"http-max-redirect"
),
NULL
);
}
}
/**
/**
...
@@ -269,7 +269,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
...
@@ -269,7 +269,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
char
*
psz
,
*
p
;
char
*
psz
,
*
p
;
/* Only forward an store cookies if the corresponding option is activated */
/* Only forward an store cookies if the corresponding option is activated */
bool
b_forward_cookies
=
var_
CreateGe
tBool
(
p_access
,
"http-forward-cookies"
);
bool
b_forward_cookies
=
var_
Inheri
tBool
(
p_access
,
"http-forward-cookies"
);
vlc_array_t
*
saved_cookies
=
b_forward_cookies
?
(
cookies
?
cookies
:
vlc_array_new
())
:
NULL
;
vlc_array_t
*
saved_cookies
=
b_forward_cookies
?
(
cookies
?
cookies
:
vlc_array_new
())
:
NULL
;
/* Set up p_access */
/* Set up p_access */
...
@@ -345,10 +345,10 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
...
@@ -345,10 +345,10 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
}
}
/* Do user agent */
/* Do user agent */
p_sys
->
psz_user_agent
=
var_
CreateGe
tString
(
p_access
,
"http-user-agent"
);
p_sys
->
psz_user_agent
=
var_
Inheri
tString
(
p_access
,
"http-user-agent"
);
/* Check proxy */
/* Check proxy */
psz
=
var_
CreateGetNonEmpty
String
(
p_access
,
"http-proxy"
);
psz
=
var_
Inherit
String
(
p_access
,
"http-proxy"
);
if
(
psz
)
if
(
psz
)
{
{
p_sys
->
b_proxy
=
true
;
p_sys
->
b_proxy
=
true
;
...
@@ -391,7 +391,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
...
@@ -391,7 +391,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
#elif defined( WIN32 )
#elif defined( WIN32 )
else
else
{
{
if
(
var_
CreateGe
tBool
(
p_access
,
"http-use-IE-proxy"
)
)
if
(
var_
Inheri
tBool
(
p_access
,
"http-use-IE-proxy"
)
)
{
{
/* Try to get the proxy server address from Windows internet settings using registry. */
/* Try to get the proxy server address from Windows internet settings using registry. */
HKEY
h_key
;
HKEY
h_key
;
...
@@ -463,7 +463,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
...
@@ -463,7 +463,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
if
(
psz
)
/* No, this is NOT a use-after-free error */
if
(
psz
)
/* No, this is NOT a use-after-free error */
{
{
psz
=
var_
CreateGetNonEmpty
String
(
p_access
,
"http-proxy-pwd"
);
psz
=
var_
Inherit
String
(
p_access
,
"http-proxy-pwd"
);
if
(
psz
)
if
(
psz
)
p_sys
->
proxy
.
psz_password
=
p_sys
->
psz_proxy_passbuf
=
psz
;
p_sys
->
proxy
.
psz_password
=
p_sys
->
psz_proxy_passbuf
=
psz
;
}
}
...
@@ -494,8 +494,8 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
...
@@ -494,8 +494,8 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
msg_Dbg
(
p_access
,
" user='%s'"
,
p_sys
->
url
.
psz_username
);
msg_Dbg
(
p_access
,
" user='%s'"
,
p_sys
->
url
.
psz_username
);
}
}
p_sys
->
b_reconnect
=
var_
CreateGe
tBool
(
p_access
,
"http-reconnect"
);
p_sys
->
b_reconnect
=
var_
Inheri
tBool
(
p_access
,
"http-reconnect"
);
p_sys
->
b_continuous
=
var_
CreateGe
tBool
(
p_access
,
"http-continuous"
);
p_sys
->
b_continuous
=
var_
Inheri
tBool
(
p_access
,
"http-continuous"
);
connect:
connect:
/* Connect */
/* Connect */
...
...
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