Changeset fe927c0f058f3f9b27a48524ff9471ae1082f1bc

Timestamp:

08/26/05 20:15:21 (3 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1125080121 +0000

git-parent:

[375abfbdd16fa92a9a23f94a87d1b6ce0ca48c25]

git-author:

Christophe Massiot <massiot@videolan.org> 1125080121 +0000

Message:

• src/extras/libc.c: Implemented a wrapper around fork() and execve()
  to spawn an external process and get its output. Only implemented for
  UNIX-style systems at present.
  
• src/misc/httpd.c: New "handler" node type which bypasses the internal
  HTTPD behaviour.
  
• modules/control/http: New --http-handlers option to dedicate
  particular extensions to external programs (PHP or Perl for instance).
  This is in accordance with the CGI/1.1 specification.
  

Files:

• configure.ac (modified) (2 diffs)
• include/vlc_common.h (modified) (2 diffs)
• include/vlc_httpd.h (modified) (1 diff)
• include/vlc_symbols.h (modified) (6 diffs)
• modules/control/http/http.c (modified) (17 diffs)
• modules/control/http/http.h (modified) (5 diffs)
• modules/control/http/util.c (modified) (4 diffs)
• src/extras/libc.c (modified) (2 diffs)
• src/misc/httpd.c (modified) (8 diffs)

configure.ac

@@ -326 +326 @@
-need_libc=false
-
-
+ fork
-
-dnl Check for usual libc functions
@@ -1883 +1883 @@
-  AC_CHECK_LIB(resolv,inet_pton,
-    [have_ipv6=yes
-
+ vlc
-])
-

include/vlc_common.h

@@ -379 +379 @@
-typedef struct httpd_file_t     httpd_file_t;
-typedef struct httpd_file_sys_t httpd_file_sys_t;
-
+
+
+
+
-typedef struct httpd_redirect_t httpd_redirect_t;
-typedef struct httpd_stream_t httpd_stream_t;
@@ -1052 +1055 @@
-VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) );
-
+/* execve wrapper (defined in src/extras/libc.c) */
+VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char **pp_argv, char **pp_env, char *psz_cwd, char *p_in, int i_in, char **pp_data, int *pi_data ) );
+#define vlc_execve(a,b,c,d,e,f,g,h,i) __vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i)
+
-/*****************************************************************************
- * CPU capabilities

include/vlc_httpd.h

@@ -141 +141 @@
-
-
+VLC_EXPORT( httpd_handler_t *, httpd_HandlerNew, ( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t * ) );
+VLC_EXPORT( void,           httpd_HandlerDelete, ( httpd_handler_t * ) );
+
+
-VLC_EXPORT( httpd_redirect_t *, httpd_RedirectNew, ( httpd_host_t *, const char *psz_url_dst, const char *psz_url_src ) );
-VLC_EXPORT( void,               httpd_RedirectDelete, ( httpd_redirect_t * ) );

include/vlc_symbols.h

@@ -167 +167 @@
-void vlc_freeaddrinfo (struct addrinfo *);
-void vlm_Delete (vlm_t *);
+void httpd_HandlerDelete (httpd_handler_t *);
-void vout_DisplayPicture (vout_thread_t *, picture_t *);
-void httpd_MsgClean (httpd_message_t *);
@@ -204 +205 @@
-const char * vlc_gai_strerror (int);
-void net_ListenClose (int *fd);
+int __vlc_execve (vlc_object_t *p_object, int i_argc, char **pp_argv, char **pp_env, char *psz_cwd, char *p_in, int i_in, char **pp_data, int *pi_data);
-int playlist_NodeAppend (playlist_t *,int,playlist_item_t*,playlist_item_t *);
-const iso639_lang_t * GetLang_2B (const char *);
@@ -358 +360 @@
-void config_SetCallbacks (module_config_t *, module_config_t *);
-int __vlc_cond_destroy (char *, int, vlc_cond_t *);
+httpd_handler_t * httpd_HandlerNew (httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t *);
-vlc_list_t * __vlc_list_find (vlc_object_t *, int, int);
-char * ToLocale (const char *);
@@ -834 +837 @@
-    int (*vlc_closedir_wrapper_inner) (void *);
-    void * (*vlc_opendir_wrapper_inner) (const char *);
+    void (*httpd_HandlerDelete_inner) (httpd_handler_t *);
+    int (*__vlc_execve_inner) (vlc_object_t *p_object, int i_argc, char **pp_argv, char **pp_env, char *psz_cwd, char *p_in, int i_in, char **pp_data, int *pi_data);
+    httpd_handler_t * (*httpd_HandlerNew_inner) (httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t *);
-};
-#  if defined (__PLUGIN__)
@@ -1233 +1239 @@
-#  define vlc_closedir_wrapper (p_symbols)->vlc_closedir_wrapper_inner
-#  define vlc_opendir_wrapper (p_symbols)->vlc_opendir_wrapper_inner
+#  define httpd_HandlerDelete (p_symbols)->httpd_HandlerDelete_inner
+#  define __vlc_execve (p_symbols)->__vlc_execve_inner
+#  define httpd_HandlerNew (p_symbols)->httpd_HandlerNew_inner
-#  elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1635 +1644 @@
-    ((p_symbols)->vlc_closedir_wrapper_inner) = vlc_closedir_wrapper; \
-    ((p_symbols)->vlc_opendir_wrapper_inner) = vlc_opendir_wrapper; \
+    ((p_symbols)->httpd_HandlerDelete_inner) = httpd_HandlerDelete; \
+    ((p_symbols)->__vlc_execve_inner) = __vlc_execve; \
+    ((p_symbols)->httpd_HandlerNew_inner) = httpd_HandlerNew; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->vlc_fix_readdir_charset_deprecated = NULL; \

modules/control/http/http.c

@@ -40 +40 @@
-#define CHARSET_LONGTEXT N_( \
-        "Charset declared in Content-Type header (default UTF-8)." )
+#define HANDLERS_TEXT N_( "Handlers" )
+#define HANDLERS_LONGTEXT N_( \
+        "List of extensions and executable paths (for instance: " \
+        "php=/usr/bin/php,pl=/usr/bin/perl)." )
-#define CERT_TEXT N_( "Certificate file" )
-#define CERT_LONGTEXT N_( "HTTP interface x509 PEM certificate file " \
@@ -59 +63 @@
-        add_string ( "http-src",  NULL, NULL, SRC_TEXT,  SRC_LONGTEXT,  VLC_TRUE );
-        add_string ( "http-charset", "UTF-8", NULL, CHARSET_TEXT, CHARSET_LONGTEXT, VLC_TRUE );
+#if defined( HAVE_FORK )
+        add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, VLC_TRUE );
+#endif
-        set_section( N_("HTTP SSL" ), 0 );
-        add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, VLC_TRUE );
@@ -109 +116 @@
-    intf_thread_t *p_intf = (intf_thread_t*)p_this;
-    intf_sys_t    *p_sys;
-
-
+
-    const char    *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
-                  *psz_crl = NULL;
@@ -116 +122 @@
-    char          *psz_src;
-
-
-
-
-
-
-
-
+
+
+
+
-        if( psz_parser )
-        {
@@ -129 +132 @@
-        }
-    }
+    else
+        psz_address = strdup("");
-
-    p_intf->p_sys = p_sys = malloc( sizeof( intf_sys_t ) );
@@ -138 +143 @@
-    p_sys->p_input    = NULL;
-    p_sys->p_vlm      = NULL;
+    p_sys->psz_address = psz_address;
+    p_sys->i_port     = i_port;
-
-    /* determine Content-Type value for HTML pages */
@@ -150 +157 @@
-    if( p_sys->psz_html_type == NULL )
-    {
+        free( p_sys->psz_address );
-        free( p_sys );
-        free( psz_src );
@@ -179 +187 @@
-    free( psz_src );
-
+    /* determine file handler associations */
+    p_sys->i_handlers = 0;
+    p_sys->pp_handlers = NULL;
+#if defined( HAVE_FORK )
+    psz_src = config_GetPsz( p_intf, "http-handlers" );
+    if( psz_src != NULL && *psz_src )
+    {
+        char *p = psz_src;
+        while( p != NULL )
+        {
+            http_association_t *p_handler;
+            char *psz_ext = p;
+            char *psz_program, *psz_options;
+            p = strchr( p, '=' );
+            if( p == NULL ) break;
+            *p++ = '\0';
+            psz_program = p;
+            p = strchr( p, ',' );
+            if( p != NULL )
+                *p++ = '\0';
+
+            p_handler = malloc( sizeof( http_association_t ) );
+            p_handler->psz_ext = strdup( psz_ext );
+            psz_options = E_(FirstWord)( psz_program, psz_program );
+            p_handler->i_argc = 0;
+            p_handler->ppsz_argv = NULL;
+            TAB_APPEND( p_handler->i_argc, p_handler->ppsz_argv,
+                        strdup( psz_program ) );
+            while( psz_options != NULL && *psz_options )
+            {
+                char *psz_next = E_(FirstWord)( psz_options, psz_options );
+                TAB_APPEND( p_handler->i_argc, p_handler->ppsz_argv,
+                            strdup( psz_options ) );
+                psz_options = psz_next;
+            }
+            /* NULL will be appended later on */
+
+            TAB_APPEND( p_sys->i_handlers, p_sys->pp_handlers, p_handler );
+        }
+    }
+    if( psz_src != NULL )
+        free( psz_src );
+#endif
+
-    /* determine SSL configuration */
-    psz_cert = config_GetPsz( p_intf, "http-intf-cert" );
@@ -207 +259 @@
-        msg_Err( p_intf, "cannot listen on %s:%d", psz_address, i_port );
-        free( p_sys->psz_html_type );
+        free( p_sys->psz_address );
-        free( p_sys );
-        return VLC_EGENERIC;
-    }
-
-    if( psz_host )
-    {
-        free( psz_host );
-    }
-
@@ -226 +274 @@
-        if( !psz_src ) return VLC_ENOMEM;
-#if defined(WIN32)
-
+ 
-#else
-
+ 
-#endif
-    }
@@ -280 +328 @@
-    }
-    httpd_HostDelete( p_sys->p_httpd_host );
+    free( p_sys->psz_address );
-    free( p_sys->psz_html_type ); 
-    if( p_sys->iconv_from_utf8 != (vlc_iconv_t)-1 )
@@ -305 +354 @@
-    for( i = 0; i < p_sys->i_files; i++ )
-    {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    if( p_sys->pp_files )
@@ -319 +371 @@
-        free( p_sys->pp_files );
-    }
+    for( i = 0; i < p_sys->i_handlers; i++ )
+    {
+        http_association_t *p_handler = p_sys->pp_handlers[i];
+        int j;
+        free( p_handler->psz_ext );
+        for( j = 0; j < p_handler->i_argc; j++ )
+            free( p_handler->ppsz_argv[j] );
+        if( p_handler->i_argc )
+            free( p_handler->ppsz_argv );
+        free( p_handler );
+    }
+    if( p_sys->i_handlers )
+        free( p_sys->pp_handlers );
-    httpd_HostDelete( p_sys->p_httpd_host );
+    free( p_sys->psz_address );
-    free( p_sys->psz_html_type );
-
@@ -383 +449 @@
- ****************************************************************************
- * a file with b_html is parsed and all "macro" replaced
- * <vlc id="macro name" [param1="" [param2=""]] />
- * valid id are
- *
- ****************************************************************************/
+static void Callback404( httpd_file_sys_t *p_args, char **pp_data,
+                         int *pi_data )
+{
+    char *p = *pp_data = malloc( 10240 );
+    if( !p )
+    {
+        return;
+    }
+    p += sprintf( p, "<html>\n" );
+    p += sprintf( p, "<head>\n" );
+    p += sprintf( p, "<title>Error loading %s</title>\n", p_args->file );
+    p += sprintf( p, "</head>\n" );
+    p += sprintf( p, "<body>\n" );
+    p += sprintf( p, "<h1><center>Error loading %s for %s</center></h1>\n", p_args->file, p_args->name );
+    p += sprintf( p, "<hr />\n" );
+    p += sprintf( p, "<a href=\"http://www.videolan.org/\">VideoLAN</a>\n" );
+    p += sprintf( p, "</body>\n" );
+    p += sprintf( p, "</html>\n" );
+
+    *pi_data = strlen( *pp_data );
+}
+
+static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
+                          int i_buffer, char *p_request,
+                          char **pp_data, int *pi_data )
+{
+    int i_request = p_request != NULL ? strlen( p_request ) : 0;
+    char *dst;
+    vlc_value_t val;
+    char position[4]; /* percentage */
+    char time[12]; /* in seconds */
+    char length[12]; /* in seconds */
+    audio_volume_t i_volume;
+    char volume[5];
+    char state[8];
+
+#define p_sys p_args->p_intf->p_sys
+    if( p_sys->p_input )
+    {
+        var_Get( p_sys->p_input, "position", &val);
+        sprintf( position, "%d" , (int)((val.f_float) * 100.0));
+        var_Get( p_sys->p_input, "time", &val);
+        sprintf( time, "%d" , (int)(val.i_time / 1000000) );
+        var_Get( p_sys->p_input, "length", &val);
+        sprintf( length, "%d" , (int)(val.i_time / 1000000) );
+
+        var_Get( p_sys->p_input, "state", &val );
+        if( val.i_int == PLAYING_S )
+        {
+            sprintf( state, "playing" );
+        }
+        else if( val.i_int == PAUSE_S )
+        {
+            sprintf( state, "paused" );
+        }
+        else
+        {
+            sprintf( state, "stop" );
+        }
+    }
+    else
+    {
+        sprintf( position, "%d", 0 );
+        sprintf( time, "%d", 0 );
+        sprintf( length, "%d", 0 );
+        sprintf( state, "stop" );
+    }
+#undef p_sys
+
+    aout_VolumeGet( p_args->p_intf, &i_volume );
+    sprintf( volume, "%d", (int)i_volume );
+
+    p_args->vars = E_(mvar_New)( "variables", "" );
+    E_(mvar_AppendNewVar)( p_args->vars, "url_param",
+                           i_request > 0 ? "1" : "0" );
+    E_(mvar_AppendNewVar)( p_args->vars, "url_value", p_request );
+    E_(mvar_AppendNewVar)( p_args->vars, "version", VLC_Version() );
+    E_(mvar_AppendNewVar)( p_args->vars, "copyright", COPYRIGHT_MESSAGE );
+    E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
+    E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_host",
+                       VLC_CompileHost() );
+    E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_domain",
+                       VLC_CompileDomain() );
+    E_(mvar_AppendNewVar)( p_args->vars, "vlc_compiler", VLC_Compiler() );
+    E_(mvar_AppendNewVar)( p_args->vars, "vlc_changeset", VLC_Changeset() );
+    E_(mvar_AppendNewVar)( p_args->vars, "stream_position", position );
+    E_(mvar_AppendNewVar)( p_args->vars, "stream_time", time );
+    E_(mvar_AppendNewVar)( p_args->vars, "stream_length", length );
+    E_(mvar_AppendNewVar)( p_args->vars, "volume", volume );
+    E_(mvar_AppendNewVar)( p_args->vars, "stream_state", state );
+
+    E_(SSInit)( &p_args->stack );
+
+    /* allocate output */
+    *pi_data = i_buffer + 1000;
+    dst = *pp_data = malloc( *pi_data );
+
+    /* we parse executing all  <vlc /> macros */
+    E_(Execute)( p_args, p_request, i_request, pp_data, pi_data, &dst,
+                 &p_buffer[0], &p_buffer[i_buffer] );
+
+    *dst     = '\0';
+    *pi_data = dst - *pp_data;
+
+    E_(SSClean)( &p_args->stack );
+    E_(mvar_Delete)( p_args->vars );
+}
+
-int  E_(HttpCallback)( httpd_file_sys_t *p_args,
-                       httpd_file_t *p_file,
@@ -394 +565 @@
-    char *p_request = (char *)_p_request;
-    char **pp_data = (char **)_pp_data;
-    int i_request = p_request ? strlen( p_request ) : 0;
-    char *p;
-    FILE *f;
-
-    if( ( f = fopen( p_args->file, "r" ) ) == NULL )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        return VLC_SUCCESS;
-    }
@@ -429 +581 @@
-        int  i_buffer;
-        char *p_buffer;
-        char *dst;
-        vlc_value_t val;
-        char position[4]; /* percentage */
-        char time[12]; /* in seconds */
-        char length[12]; /* in seconds */
-        audio_volume_t i_volume;
-        char volume[5];
-        char state[8];
- 
-#define p_sys p_args->p_intf->p_sys
-        if( p_sys->p_input )
-        {
-            var_Get( p_sys->p_input, "position", &val);
-            sprintf( position, "%d" , (int)((val.f_float) * 100.0));
-            var_Get( p_sys->p_input, "time", &val);
-            sprintf( time, "%d" , (int)(val.i_time / 1000000) );
-            var_Get( p_sys->p_input, "length", &val);
-            sprintf( length, "%d" , (int)(val.i_time / 1000000) );
-
-            var_Get( p_sys->p_input, "state", &val );
-            if( val.i_int == PLAYING_S )
-            {
-                sprintf( state, "playing" );
-            }
-            else if( val.i_int == PAUSE_S )
-            {
-                sprintf( state, "paused" );
-            }
-            else
-            {
-                sprintf( state, "stop" );
-            }
-        }
-        else
-        {
-            sprintf( position, "%d", 0 );
-            sprintf( time, "%d", 0 );
-            sprintf( length, "%d", 0 );
-            sprintf( state, "stop" );
-        }
-#undef p_sys
-
-        aout_VolumeGet( p_args->p_intf , &i_volume );
-        sprintf( volume , "%d" , (int)i_volume );
-
-        p_args->vars = E_(mvar_New)( "variables", "" );
-        E_(mvar_AppendNewVar)( p_args->vars, "url_param",
-                           i_request > 0 ? "1" : "0" );
-        E_(mvar_AppendNewVar)( p_args->vars, "url_value", p_request );
-        E_(mvar_AppendNewVar)( p_args->vars, "version", VLC_Version() );
-        E_(mvar_AppendNewVar)( p_args->vars, "copyright", COPYRIGHT_MESSAGE );
-        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
-        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_host",
-                           VLC_CompileHost() );
-        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_domain",
-                           VLC_CompileDomain() );
-        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compiler", VLC_Compiler() );
-        E_(mvar_AppendNewVar)( p_args->vars, "vlc_changeset", VLC_Changeset() );
-        E_(mvar_AppendNewVar)( p_args->vars, "stream_position", position );
-        E_(mvar_AppendNewVar)( p_args->vars, "stream_time", time );
-        E_(mvar_AppendNewVar)( p_args->vars, "stream_length", length );
-        E_(mvar_AppendNewVar)( p_args->vars, "volume", volume );
-        E_(mvar_AppendNewVar)( p_args->vars, "stream_state", state );
-
-        E_(SSInit)( &p_args->stack );
-
-        /* first we load in a temporary buffer */
-        E_(FileLoad)( f, &p_buffer, &i_buffer );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        free( p_buffer );
-    }
@@ -519 +595 @@
-}
-
+/****************************************************************************
+ * HandlerCallback:
+ ****************************************************************************
+ * call the external handler and parse vlc macros if Content-Type is HTML
+ ****************************************************************************/
+int  E_(HandlerCallback)( httpd_handler_sys_t *p_args,
+                          httpd_handler_t *p_handler, uint8_t *_p_url,
+                          uint8_t *_p_request, int i_type,
+                          uint8_t *_p_in, int i_in,
+                          char *psz_remote_addr, char *psz_remote_host,
+                          uint8_t **_pp_data, int *pi_data )
+{
+    char *p_url = (char *)_p_url;
+    char *p_request = (char *)_p_request;
+    char **pp_data = (char **)_pp_data;
+    char *p_in = (char *)p_in;
+    int i_request = p_request != NULL ? strlen( p_request ) : 0;
+    char *p;
+    int i_env = 0;
+    char **pp_env = NULL;
+    char *psz_tmp;
+    char sep;
+    int  i_buffer;
+    char *p_buffer;
+    char *psz_cwd;
+
+#ifdef WIN32
+    sep = '\\';
+#else
+    sep = '/';
+#endif
+
+    /* Create environment for the CGI */
+    TAB_APPEND( i_env, pp_env, strdup("GATEWAY_INTERFACE=CGI/1.1") );
+    TAB_APPEND( i_env, pp_env, strdup("SERVER_PROTOCOL=HTTP/1.1") );
+    TAB_APPEND( i_env, pp_env, strdup("SERVER_SOFTWARE=" COPYRIGHT_MESSAGE) );
+
+    switch( i_type )
+    {
+    case HTTPD_MSG_GET:
+        TAB_APPEND( i_env, pp_env, strdup("REQUEST_METHOD=GET") );
+        break;
+    case HTTPD_MSG_POST:
+        TAB_APPEND( i_env, pp_env, strdup("REQUEST_METHOD=POST") );
+        break;
+    case HTTPD_MSG_HEAD:
+        TAB_APPEND( i_env, pp_env, strdup("REQUEST_METHOD=HEAD") );
+        break;
+    default:
+        break;
+    }
+
+    if( i_request )
+    {
+        psz_tmp = malloc( sizeof("QUERY_STRING=") + i_request );
+        sprintf( psz_tmp, "QUERY_STRING=%s", p_request );
+        TAB_APPEND( i_env, pp_env, psz_tmp );
+
+        psz_tmp = malloc( sizeof("REQUEST_URI=?") + strlen(p_url)
+                           + i_request );
+        sprintf( psz_tmp, "REQUEST_URI=%s?%s", p_url, p_request );
+        TAB_APPEND( i_env, pp_env, psz_tmp );
+    }
+    else
+    {
+        psz_tmp = malloc( sizeof("REQUEST_URI=") + strlen(p_url) );
+        sprintf( psz_tmp, "REQUEST_URI=%s", p_url );
+        TAB_APPEND( i_env, pp_env, psz_tmp );
+    }
+
+    psz_tmp = malloc( sizeof("SCRIPT_NAME=") + strlen(p_url) );
+    sprintf( psz_tmp, "SCRIPT_NAME=%s", p_url );
+    TAB_APPEND( i_env, pp_env, psz_tmp );
+
+    psz_tmp = malloc( sizeof("SCRIPT_FILENAME=") + strlen(p_args->file.file) );
+    sprintf( psz_tmp, "SCRIPT_FILENAME=%s", p_args->file.file );
+    TAB_APPEND( i_env, pp_env, psz_tmp );
+
+#define p_sys p_args->file.p_intf->p_sys
+    psz_tmp = malloc( sizeof("SERVER_NAME=") + strlen(p_sys->psz_address) );
+    sprintf( psz_tmp, "SERVER_NAME=%s", p_sys->psz_address );
+    TAB_APPEND( i_env, pp_env, psz_tmp );
+
+    psz_tmp = malloc( sizeof("SERVER_PORT=") + 5 );
+    sprintf( psz_tmp, "SERVER_PORT=%u", p_sys->i_port );
+    TAB_APPEND( i_env, pp_env, psz_tmp );
+#undef p_sys
+
+    if( psz_remote_addr != NULL && *psz_remote_addr )
+    {
+        psz_tmp = malloc( sizeof("REMOTE_ADDR=") + strlen(psz_remote_addr) );
+        sprintf( psz_tmp, "REMOTE_ADDR=%s", psz_remote_addr );
+        TAB_APPEND( i_env, pp_env, psz_tmp );
+    }
+
+    if( psz_remote_host != NULL && *psz_remote_host )
+    {
+        psz_tmp = malloc( sizeof("REMOTE_HOST=") + strlen(psz_remote_host) );
+        sprintf( psz_tmp, "REMOTE_HOST=%s", psz_remote_host );
+        TAB_APPEND( i_env, pp_env, psz_tmp );
+    }
+
+    if( i_in )
+    {
+        p = p_in;
+        for ( ; ; )
+        {
+            if( !strncmp( p, "Content-Type: ", strlen("Content-Type: ") ) )
+            {
+                char *end = strchr( p, '\r' );
+                if( end == NULL )
+                    break;
+                *end = '\0';
+                psz_tmp = malloc( sizeof("CONTENT_TYPE=") + strlen(p) );
+                sprintf( psz_tmp, "CONTENT_TYPE=%s", p );
+                TAB_APPEND( i_env, pp_env, psz_tmp );
+                *end = '\r';
+            }
+            if( !strncmp( p, "Content-Length: ", strlen("Content-Length: ") ) )
+            {
+                char *end = strchr( p, '\r' );
+                if( end == NULL )
+                    break;
+                *end = '\0';
+                psz_tmp = malloc( sizeof("CONTENT_LENGTH=") + strlen(p) );
+                sprintf( psz_tmp, "CONTENT_LENGTH=%s", p );
+                TAB_APPEND( i_env, pp_env, psz_tmp );
+                *end = '\r';
+            }
+
+            p = strchr( p, '\n' );
+            if( p == NULL || p[1] == '\r' )
+            {
+                p = NULL;
+                break;
+            }
+            p++;
+        }
+    }
+
+    TAB_APPEND( i_env, pp_env, NULL );
+
+    TAB_APPEND( p_args->p_association->i_argc, p_args->p_association->ppsz_argv,
+                p_args->file.file );
+    TAB_APPEND( p_args->p_association->i_argc, p_args->p_association->ppsz_argv,
+                NULL );
+
+    psz_tmp = strdup( p_args->file.file );
+    p = strrchr( psz_tmp, sep );
+    if( p != NULL )
+    {
+        *p = '\0';
+        psz_cwd = psz_tmp;
+    }
+    else
+    {
+        free( psz_tmp );
+        psz_cwd = NULL;
+    }
+
+    if( vlc_execve( p_args->file.p_intf, p_args->p_association->i_argc,
+                    p_args->p_association->ppsz_argv, pp_env, psz_cwd,
+                    (char *)p_in, i_in, &p_buffer, &i_buffer ) == -1 )
+    {
+        TAB_REMOVE( p_args->p_association->i_argc,
+                    p_args->p_association->ppsz_argv, NULL );
+        TAB_REMOVE( p_args->p_association->i_argc,
+                    p_args->p_association->ppsz_argv, p_args->file.file );
+        if( psz_cwd != NULL )
+            free( psz_cwd );
+
+        Callback404( (httpd_file_sys_t *)p_args, pp_data, pi_data );
+        return VLC_SUCCESS;
+    }
+    TAB_REMOVE( p_args->p_association->i_argc, p_args->p_association->ppsz_argv,
+                NULL );
+    TAB_REMOVE( p_args->p_association->i_argc, p_args->p_association->ppsz_argv,
+                p_args->file.file );
+    if( psz_cwd != NULL )
+        free( psz_cwd );
+
+    p = p_buffer;
+    while( strncmp( p, "Content-Type: text/html",
+                    strlen("Content-Type: text/html") ) )
+    {
+        p = strchr( p, '\n' );
+        if( p == NULL || p[1] == '\r' )
+        {
+            p = NULL;
+            break;
+        }
+        p++;
+    }
+
+    if( p == NULL )
+    {
+        *pp_data = p_buffer;
+        *pi_data = i_buffer;
+    }
+    else
+    {
+        ParseExecute( (httpd_file_sys_t *)p_args, p_buffer, i_buffer,
+                      p_request, pp_data, pi_data );
+
+        free( p_buffer );
+    }
+
+    return VLC_SUCCESS;
+}

modules/control/http/http.h

@@ -335 +335 @@
-    char          *name;
-
-
+, b_handler
-
-    /* inited for each access */
@@ -343 +343 @@
-
-/** \struct
+ * Structure associating an extension to an external program
+ */
+typedef struct http_association_t
+{
+    char                *psz_ext;
+    int                 i_argc;
+    char                **ppsz_argv;
+} http_association_t;
+
+/** \struct
+ * This structure represent a single CGI file to be parsed by the macros
+ * handling engine */
+struct httpd_handler_sys_t
+{
+    httpd_file_sys_t file;
+
+    /* HACK ALERT: this is added below so that casting httpd_handler_sys_t
+     * to httpd_file_sys_t works */
+    httpd_handler_t  *p_handler;
+    http_association_t *p_association;
+};
+
+/** \struct
- * Internal service structure for the HTTP interface
- */
@@ -351 +374 @@
-    int                 i_files;
-    httpd_file_sys_t    **pp_files;
+
+    int                 i_handlers;
+    http_association_t  **pp_handlers;
-
-    playlist_t          *p_playlist;
@@ -357 +383 @@
-    char                *psz_html_type;
-    vlc_iconv_t         iconv_from_utf8, iconv_to_utf8;
+
+    char                *psz_address;
+    unsigned short      i_port;
-};
-
@@ -364 +393 @@
-                      uint8_t *p_request,
-                      uint8_t **pp_data, int *pi_data );
+/** This function is the HTTPD Callback used for CGIs */
+int  E_(HandlerCallback)( httpd_handler_sys_t *p_args,
+                          httpd_handler_t *p_handler, uint8_t *_p_url,
+                          uint8_t *_p_request, int i_type,
+                          uint8_t *_p_in, int i_in,
+                          char *psz_remote_addr, char *psz_remote_host,
+                          uint8_t **_pp_data, int *pi_data );
-/**@}*/
-

modules/control/http/util.c

@@ -102 +102 @@
-/* Parse a directory and recursively add files */
-int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
-   
+
-{
-    intf_sys_t     *p_sys = p_intf->p_sys;
@@ -206 +206 @@
-        if( E_(ParseDirectory)( p_intf, psz_root, dir ) )
-        {
-
+
+
-            vlc_bool_t b_index;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            f->p_intf  = p_intf;
@@ -214 +244 @@
-            f->p_redir = NULL;
-            f->p_redir2 = NULL;
-
-
-
-
-
-
-
+
+
-            f->b_html = strstr( &dir[strlen( psz_root )], ".htm" ) ? VLC_TRUE : VLC_FALSE;
-
@@ -233 +258 @@
-                     f->file, f->name );
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+