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
49947b14
Commit
49947b14
authored
Mar 06, 2003
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* http: fixed a segfault while using it more than once.
parent
fe4a517f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
include/httpd.h
include/httpd.h
+7
-1
modules/misc/httpd.c
modules/misc/httpd.c
+2
-2
No files found.
include/httpd.h
View file @
49947b14
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* httpd.h
* httpd.h
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* Copyright (C) 2001-2003 VideoLAN
* $Id: httpd.h,v 1.
2 2003/02/25 17:17:43
fenrir Exp $
* $Id: httpd.h,v 1.
3 2003/03/06 11:09:56
fenrir Exp $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
...
@@ -76,6 +76,7 @@ static inline httpd_t* httpd_Find( vlc_object_t *p_this, vlc_bool_t b_create )
...
@@ -76,6 +76,7 @@ static inline httpd_t* httpd_Find( vlc_object_t *p_this, vlc_bool_t b_create )
p_httpd
=
vlc_object_find
(
p_this
,
VLC_OBJECT_HTTPD
,
FIND_ANYWHERE
);
p_httpd
=
vlc_object_find
(
p_this
,
VLC_OBJECT_HTTPD
,
FIND_ANYWHERE
);
if
(
!
p_httpd
)
if
(
!
p_httpd
)
{
{
msg_Info
(
p_this
,
"creating new http daemon"
);
if
(
!
b_create
)
if
(
!
b_create
)
{
{
return
(
NULL
);
return
(
NULL
);
...
@@ -98,6 +99,7 @@ static inline httpd_t* httpd_Find( vlc_object_t *p_this, vlc_bool_t b_create )
...
@@ -98,6 +99,7 @@ static inline httpd_t* httpd_Find( vlc_object_t *p_this, vlc_bool_t b_create )
}
}
vlc_object_yield
(
p_httpd
);
vlc_object_yield
(
p_httpd
);
vlc_object_attach
(
p_httpd
,
p_this
->
p_vlc
);
}
}
return
(
p_httpd
);
return
(
p_httpd
);
...
@@ -106,6 +108,10 @@ static inline httpd_t* httpd_Find( vlc_object_t *p_this, vlc_bool_t b_create )
...
@@ -106,6 +108,10 @@ static inline httpd_t* httpd_Find( vlc_object_t *p_this, vlc_bool_t b_create )
static
inline
void
httpd_Release
(
httpd_t
*
p_httpd
)
static
inline
void
httpd_Release
(
httpd_t
*
p_httpd
)
{
{
vlc_object_release
(
p_httpd
);
vlc_object_release
(
p_httpd
);
if
(
p_httpd
->
i_refcount
<=
0
)
{
vlc_object_detach
(
p_httpd
);
}
}
}
...
...
modules/misc/httpd.c
View file @
49947b14
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* httpd.c
* httpd.c
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* Copyright (C) 2001-2003 VideoLAN
* $Id: httpd.c,v 1.
6 2003/03/03 14:21:08 gbazin
Exp $
* $Id: httpd.c,v 1.
7 2003/03/06 11:09:56 fenrir
Exp $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
...
@@ -438,7 +438,7 @@ static httpd_host_t *_RegisterHost( httpd_sys_t *p_httpt, char *psz_host_addr, i
...
@@ -438,7 +438,7 @@ static httpd_host_t *_RegisterHost( httpd_sys_t *p_httpt, char *psz_host_addr, i
/* yes, increment ref count and succed */
/* yes, increment ref count and succed */
p_httpt
->
host
[
i
]
->
i_ref
++
;
p_httpt
->
host
[
i
]
->
i_ref
++
;
vlc_mutex_unlock
(
&
p_httpt
->
host_lock
);
vlc_mutex_unlock
(
&
p_httpt
->
host_lock
);
return
NULL
;
return
(
p_httpt
->
host
[
i
]
)
;
}
}
/* need to add a new listening socket */
/* need to add a new listening socket */
...
...
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