mirror of https://code.videolan.org/videolan/vlc
* src/*: portability fixes.
* msvc/vlc.dsw: httpd is not a plugin anymore.
This commit is contained in:
parent
291b59b66a
commit
c55e169d9b
12
msvc/vlc.dsw
12
msvc/vlc.dsw
|
@ -102,18 +102,6 @@ Package=<4>
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "plugin_httpd"=.\plugin_httpd.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "plugin_access_output_udp"=.\plugin_access_output_udp.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
|
|
|
@ -846,11 +846,7 @@ vlc_module_begin();
|
|||
SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, VLC_FALSE );
|
||||
add_integer( "sub-autodetect-fuzzy", 3, NULL,
|
||||
SUB_FUZZY_TEXT, SUB_FUZZY_LONGTEXT, VLC_TRUE );
|
||||
#if defined( WIN32 )
|
||||
add_string( "sub-autodetect-path", ".\\subtitles", NULL,
|
||||
#else
|
||||
add_string( "sub-autodetect-path", "./Subtitles, ./subtitles", NULL,
|
||||
#endif
|
||||
SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE );
|
||||
add_file( "sub-file", NULL, NULL,
|
||||
SUB_FILE_TEXT, SUB_FILE_LONGTEXT, VLC_TRUE );
|
||||
|
|
|
@ -1268,7 +1268,7 @@ static void httpd_ClientInit( httpd_client_t *cl )
|
|||
{
|
||||
cl->i_state = HTTPD_CLIENT_RECEIVING;
|
||||
cl->i_activity_date = mdate();
|
||||
cl->i_activity_timeout = 50000000LL;
|
||||
cl->i_activity_timeout = 50000000;
|
||||
cl->i_buffer_size = 10000;
|
||||
cl->i_buffer = 0;
|
||||
cl->p_buffer = malloc( cl->i_buffer_size );
|
||||
|
@ -1933,11 +1933,13 @@ static void httpd_HostThread( httpd_host_t *host )
|
|||
if( answer && ( *url->psz_user || *url->psz_password ) )
|
||||
{
|
||||
/* create the headers */
|
||||
char id[strlen(url->psz_user)+strlen(url->psz_password) + 2];
|
||||
char *b64 = httpd_MsgGet( query, "Authorization" ); /* BASIC id */
|
||||
char auth[strlen(b64) +1];
|
||||
char *auth;
|
||||
char *id;
|
||||
|
||||
asprintf( &id, "%s:%s", url->psz_user, url->psz_password );
|
||||
auth = malloc( strlen(b64) + 1 );
|
||||
|
||||
sprintf( id, "%s:%s", url->psz_user, url->psz_password );
|
||||
if( !strncasecmp( b64, "BASIC", 5 ) )
|
||||
{
|
||||
b64 += 5;
|
||||
|
@ -1956,8 +1958,13 @@ static void httpd_HostThread( httpd_host_t *host )
|
|||
httpd_MsgAdd( answer, "WWW-Authenticate", "Basic realm=\"%s\"", url->psz_user );
|
||||
/* We fail for all url */
|
||||
b_auth_failed = VLC_TRUE;
|
||||
free( id );
|
||||
free( auth );
|
||||
break;
|
||||
}
|
||||
|
||||
free( id );
|
||||
free( auth );
|
||||
}
|
||||
|
||||
if( !url->catch[i_msg].cb( url->catch[i_msg].p_sys, cl, answer, query ) )
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* announce.c : announce handler
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2002-2004 VideoLAN
|
||||
* $Id: stream_output.c 7307 2004-04-07 23:13:03Z zorglub $
|
||||
* $Id$
|
||||
*
|
||||
* Authors: Clément Stenac <zorglub@videolan.org>
|
||||
*
|
||||
|
@ -277,8 +277,8 @@ int announce_Register( announce_handler_t *p_announce,
|
|||
/* Do we already have a SAP announce handler ? */
|
||||
if( !p_announce->p_sap )
|
||||
{
|
||||
msg_Dbg( p_announce, "creating SAP announce handler");
|
||||
sap_handler_t *p_sap = announce_SAPHandlerCreate( p_announce );
|
||||
msg_Dbg( p_announce, "creating SAP announce handler");
|
||||
if( !p_sap )
|
||||
{
|
||||
msg_Err( p_announce, "SAP handler creation failed" );
|
||||
|
|
Loading…
Reference in New Issue