* http.c : HTTP/HTTPS Remote control interface
*****************************************************************************
* Copyright (C) 2001-2006 the VideoLAN team
- * $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Laurent Aimar <fenrir@via.ecp.fr>
#include "http.h"
#include <vlc_plugin.h>
+#include <assert.h>
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file." )
vlc_module_begin();
- set_shortname( _("HTTP"));
- set_description( _("HTTP remote control interface") );
+ set_shortname( N_("HTTP"));
+ set_description( N_("HTTP remote control interface") );
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_MAIN );
add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true );
intf_thread_t *p_intf = (intf_thread_t*)p_this;
intf_sys_t *p_sys;
char *psz_address;
- const char *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
+ char *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
*psz_crl = NULL;
int i_port = 0;
char *psz_src = NULL;
p_sys->p_httpd_host = httpd_TLSHostNew( VLC_OBJECT(p_intf), psz_address,
i_port, psz_cert, psz_key, psz_ca,
psz_crl );
+ free( psz_cert );
+ free( psz_key );
+ free( psz_ca );
+ free( psz_crl );
+
if( p_sys->p_httpd_host == NULL )
{
msg_Err( p_intf, "cannot listen on %s:%d", psz_address, i_port );
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
intf_sys_t *p_sys = p_intf->p_sys;
-
int i;
+#ifdef ENABLE_VLM
if( p_sys->p_vlm )
- {
vlm_Delete( p_sys->p_vlm );
- }
+#endif
for( i = 0; i < p_sys->i_files; i++ )
{
if( p_sys->pp_files[i]->b_handler )
char *p_url = (char *)_p_url;
char *p_request = (char *)_p_request;
char **pp_data = (char **)_pp_data;
- char *p_in = (char *)p_in;
+ char *p_in = (char *)_p_in;
int i_request = p_request != NULL ? strlen( p_request ) : 0;
char *p;
int i_env = 0;