* 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.

configure.ac

@@ -325,7 +325,7 @@ CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcd
 dnl Check for system libs needed
 need_libc=false
 
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork)
 
 dnl Check for usual libc functions
 AC_CHECK_FUNCS(strdup strndup atof)
@@ -1882,7 +1882,7 @@ have_ipv6=no
 AC_CHECK_FUNCS(inet_pton,[have_ipv6=yes],[
   AC_CHECK_LIB(resolv,inet_pton,
     [have_ipv6=yes
-     VLC_ADD_LDFLAGS([ipv6],[-lresolv])])
+     VLC_ADD_LDFLAGS([ipv6 vlc],[-lresolv])])
 ])
 
 AS_IF([test "${have_ipv6}" == "yes"], [

include/vlc_common.h

@@ -378,7 +378,10 @@ typedef struct httpd_message_t  httpd_message_t;
 typedef int    (*httpd_callback_t)( httpd_callback_sys_t *, httpd_client_t *, httpd_message_t *answer, httpd_message_t *query );
 typedef struct httpd_file_t     httpd_file_t;
 typedef struct httpd_file_sys_t httpd_file_sys_t;
-typedef int (*httpd_file_callback_t)( httpd_file_sys_t*, httpd_file_t *, uint8_t *psz_request, uint8_t **pp_data, int *pi_data );
+typedef int (*httpd_file_callback_t)( httpd_file_sys_t *, httpd_file_t *, uint8_t *psz_request, uint8_t **pp_data, int *pi_data );
+typedef struct httpd_handler_t  httpd_handler_t;
+typedef struct httpd_handler_sys_t httpd_handler_sys_t;
+typedef int (*httpd_handler_callback_t)( httpd_handler_sys_t *, httpd_handler_t *, uint8_t *psz_url, uint8_t *psz_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 );
 typedef struct httpd_redirect_t httpd_redirect_t;
 typedef struct httpd_stream_t httpd_stream_t;
 
@@ -1051,6 +1054,10 @@ VLC_EXPORT( vlc_iconv_t, vlc_iconv_open, ( const char *, const char * ) );
 VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, char **, size_t *, char **, size_t * ) );
 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

@@ -140,6 +140,10 @@ VLC_EXPORT( httpd_file_t *, httpd_FileNew, ( httpd_host_t *, const char *psz_url
 VLC_EXPORT( void,           httpd_FileDelete, ( httpd_file_t * ) );
 
 
+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

@@ -166,6 +166,7 @@ char * vlc_strcasestr (const char *s1, const char *s2);
 httpd_file_t * httpd_FileNew (httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t *);
 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 *);
 int vout_ControlWindow (vout_thread_t *, void *, int, va_list);
@@ -203,6 +204,7 @@ float __config_GetFloat (vlc_object_t *, const char *);
 playlist_item_t * playlist_ItemGetById (playlist_t *, int);
 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 *);
 void sout_AccessOutDelete (sout_access_out_t *);
@@ -357,6 +359,7 @@ module_config_t * config_FindConfig (vlc_object_t *, const char *);
 playlist_item_t * playlist_ItemGetByInput (playlist_t *,input_item_t *);
 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 *);
 int vlm_Load (vlm_t *, char *);
@@ -833,6 +836,9 @@ struct module_symbols_t
     struct dirent * (*vlc_readdir_wrapper_inner) (void *);
     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__)
 #  define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
@@ -1232,6 +1238,9 @@ struct module_symbols_t
 #  define vlc_readdir_wrapper (p_symbols)->vlc_readdir_wrapper_inner
 #  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__)
 /******************************************************************
  * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
@@ -1634,6 +1643,9 @@ struct module_symbols_t
     ((p_symbols)->vlc_readdir_wrapper_inner) = vlc_readdir_wrapper; \
     ((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; \
     (p_symbols)->osd_Slider_deprecated = NULL; \

modules/control/http/http.h

@@ -334,13 +334,36 @@ struct httpd_file_sys_t
     char          *file;
     char          *name;
 
-    vlc_bool_t    b_html;
+    vlc_bool_t    b_html, b_handler;
 
     /* inited for each access */
     rpn_stack_t   stack;
     mvar_t        *vars;
 };
 
+/** \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,11 +374,17 @@ struct intf_sys_t
     int                 i_files;
     httpd_file_sys_t    **pp_files;
 
+    int                 i_handlers;
+    http_association_t  **pp_handlers;
+
     playlist_t          *p_playlist;
     input_thread_t      *p_input;
     vlm_t               *p_vlm;
     char                *psz_html_type;
     vlc_iconv_t         iconv_from_utf8, iconv_to_utf8;
+
+    char                *psz_address;
+    unsigned short      i_port;
 };
 
 /** This function is the main HTTPD Callback used by the HTTP Interface */
@@ -363,6 +392,13 @@ int E_(HttpCallback)( httpd_file_sys_t *p_args,
                       httpd_file_t *,
                       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 );
 /**@}*/
 
 #endif

modules/control/http/util.c

@@ -101,7 +101,7 @@ int E_(FileLoad)( FILE *f, char **pp_data, int *pi_data )
 
 /* Parse a directory and recursively add files */
 int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
-                           char *psz_dir )
+                        char *psz_dir )
 {
     intf_sys_t     *p_sys = p_intf->p_sys;
     char           dir[MAX_DIR_SIZE];
@@ -205,21 +205,46 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
         sprintf( dir, "%s%c%s", psz_dir, sep, p_dir_content->d_name );
         if( E_(ParseDirectory)( p_intf, psz_root, dir ) )
         {
-            httpd_file_sys_t *f = malloc( sizeof( httpd_file_sys_t ) );
+            httpd_file_sys_t *f = NULL;
+            httpd_handler_sys_t *h = NULL;
             vlc_bool_t b_index;
-            char *psz_tmp;
+            char *psz_tmp, *psz_file, *psz_name, *psz_ext;
 
-            f->p_intf  = p_intf;
-            f->p_file = NULL;
-            f->p_redir = NULL;
-            f->p_redir2 = NULL;
             psz_tmp = vlc_fix_readdir_charset( p_intf, dir );
-            f->file = E_(FromUTF8)( p_intf, psz_tmp );
+            psz_file = E_(FromUTF8)( p_intf, psz_tmp );
             free( psz_tmp );
             psz_tmp = vlc_fix_readdir_charset( p_intf,
                                                &dir[strlen( psz_root )] );
-            f->name = E_(FileToUrl)( psz_tmp, &b_index );
+            psz_name = E_(FileToUrl)( psz_tmp, &b_index );
             free( psz_tmp );
+            psz_ext = strrchr( psz_file, '.' );
+            if( psz_ext != NULL )
+            {
+                int i;
+                psz_ext++;
+                for( i = 0; i < p_sys->i_handlers; i++ )
+                    if( !strcmp( p_sys->pp_handlers[i]->psz_ext, psz_ext ) )
+                        break;
+                if( i < p_sys->i_handlers )
+                {
+                    f = malloc( sizeof( httpd_handler_sys_t ) );
+                    h = (httpd_handler_sys_t *)f;
+                    f->b_handler = VLC_TRUE;
+                    h->p_association = p_sys->pp_handlers[i];
+                }
+            }
+            if( f == NULL )
+            {
+                f = malloc( sizeof( httpd_file_sys_t ) );
+                f->b_handler = VLC_FALSE;
+            }
+
+            f->p_intf  = p_intf;
+            f->p_file = NULL;
+            f->p_redir = NULL;
+            f->p_redir2 = NULL;
+            f->file = psz_file;
+            f->name = psz_name;
             f->b_html = strstr( &dir[strlen( psz_root )], ".htm" ) ? VLC_TRUE : VLC_FALSE;
 
             if( !f->name )
@@ -232,16 +257,32 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
             msg_Dbg( p_intf, "file=%s (url=%s)",
                      f->file, f->name );
 
-            f->p_file = httpd_FileNew( p_sys->p_httpd_host,
-                                       f->name,
-                                       f->b_html ? p_sys->psz_html_type : NULL,
-                                       user, password, p_acl,
-                                       E_(HttpCallback), f );
-
-            if( f->p_file )
+            if( !f->b_handler )
+            {
+                f->p_file = httpd_FileNew( p_sys->p_httpd_host,
+                                           f->name,
+                                           f->b_html ? p_sys->psz_html_type :
+                                            NULL,
+                                           user, password, p_acl,
+                                           E_(HttpCallback), f );
+                if( f->p_file != NULL )
+                {
+                    TAB_APPEND( p_sys->i_files, p_sys->pp_files, f );
+                }
+            }
+            else
             {
-                TAB_APPEND( p_sys->i_files, p_sys->pp_files, f );
+                h->p_handler = httpd_HandlerNew( p_sys->p_httpd_host,
+                                                 f->name,
+                                                 user, password, p_acl,
+                                                 E_(HandlerCallback), h );
+                if( h->p_handler != NULL )
+                {
+                    TAB_APPEND( p_sys->i_files, p_sys->pp_files,
+                                (httpd_file_sys_t *)h );
+                }
             }
+
             /* for url that ends by / add
              *  - a redirect from rep to rep/
              *  - in case of index.* rep/index.html to rep/ */

src/extras/libc.c

@@ -43,6 +43,13 @@
 #   include <dirent.h>
 #endif
 
+#ifdef HAVE_FORK
+#   include <sys/time.h>
+#   include <unistd.h>
+#   include <errno.h>
+#   include <sys/wait.h>
+#endif
+
 /*****************************************************************************
  * getenv: just in case, but it should never be called
  *****************************************************************************/
@@ -810,3 +817,137 @@ char **vlc_parse_cmdline( const char *psz_cmdline, int *i_args )
     free( psz_orig );
     return argv;
 }
+
+/*************************************************************************
+ * vlc_execve: Execute an external program with a given environment,
+ * wait until it finishes and return its standard output
+ *************************************************************************/
+int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv,
+                  char **ppsz_env, char *psz_cwd, char *p_in, int i_in,
+                  char **pp_data, int *pi_data )
+{
+#ifdef HAVE_FORK
+    int pi_stdin[2];
+    int pi_stdout[2];
+    pid_t i_child_pid;
+
+    pipe( pi_stdin );
+    pipe( pi_stdout );
+
+    if ( (i_child_pid = fork()) == -1 )
+    {
+        msg_Err( p_object, "unable to fork (%s)", strerror(errno) );
+        return -1;
+    }
+
+    if ( i_child_pid == 0 )
+    {
+        close(0);
+        dup(pi_stdin[1]);
+        close(pi_stdin[0]);
+
+        close(1);
+        dup(pi_stdout[1]);
+        close(pi_stdout[0]);
+
+        close(2);
+
+        if ( psz_cwd != NULL )
+            chdir( psz_cwd );
+        execve( ppsz_argv[0], ppsz_argv, ppsz_env );
+        exit(1);
+    }
+
+    close(pi_stdin[1]);
+    close(pi_stdout[1]);
+    if ( !i_in )
+        close( pi_stdin[0] );
+
+    *pi_data = 0;
+    *pp_data = malloc( 1025 );  /* +1 for \0 */
+
+    while ( !p_object->b_die )
+    {
+        int i_ret, i_status;
+        fd_set readfds, writefds;
+        struct timeval tv;
+
+        FD_ZERO( &readfds );
+        FD_ZERO( &writefds );
+        FD_SET( pi_stdout[0], &readfds );
+        if ( i_in )
+            FD_SET( pi_stdin[0], &writefds );
+
+        tv.tv_sec = 0;
+        tv.tv_usec = 10000;
+        
+        i_ret = select( pi_stdin[0] > pi_stdout[0] ? pi_stdin[0] + 1 :
+                        pi_stdout[0] + 1, &readfds, &writefds, NULL, &tv );
+        if ( i_ret > 0 )
+        {
+            if ( FD_ISSET( pi_stdout[0], &readfds ) )
+            {
+                ssize_t i_read = read( pi_stdout[0], &(*pp_data)[*pi_data],
+                                       1024 );
+                if ( i_read > 0 )
+                {
+                    *pi_data += i_read;
+                    *pp_data = realloc( *pp_data, *pi_data + 1025 );
+                }
+            }
+            if ( FD_ISSET( pi_stdin[0], &writefds ) )
+            {
+                ssize_t i_write = write( pi_stdin[0], p_in, __MIN(i_in, 1024) );
+
+                if ( i_write > 0 )
+                {
+                    p_in += i_write;
+                    i_in -= i_write;
+                }
+                if ( !i_in )
+                    close( pi_stdin[0] );
+            }
+        }
+
+        if ( waitpid( i_child_pid, &i_status, WNOHANG ) == i_child_pid )
+        {
+            if ( WIFEXITED( i_status ) )
+            {
+                if ( WEXITSTATUS( i_status ) )
+                {
+                    msg_Warn( p_object,
+                              "child %s returned with error code %d",
+                              ppsz_argv[0], WEXITSTATUS( i_status ) );
+                }
+            }
+            else
+            {
+                if ( WIFSIGNALED( i_status ) )
+                {
+                    msg_Warn( p_object,
+                              "child %s quit on signal %d", ppsz_argv[0],
+                              WTERMSIG( i_status ) );
+                }
+            }
+            if ( i_in )
+                close( pi_stdin[0] );
+            close( pi_stdout[0] );
+            break;
+        }
+
+        if ( i_ret < 0 && errno != EINTR )
+        {
+            msg_Warn( p_object, "select failed (%s)", strerror(errno) );
+        }
+    }
+
+#else
+    msg_Err( p_intf, "vlc_execve called but no implementation is available" );
+    return -1;
+
+#endif
+
+    (*pp_data)[*pi_data] = '\0';
+
+    return 0;
+}

src/misc/httpd.c

@@ -431,7 +431,7 @@ static const char *httpd_MimeFromUrl( const char *psz_url )
 }
 
 /*****************************************************************************
- * High Level Funtions: httpd_file_t
+ * High Level Functions: httpd_file_t
  *****************************************************************************/
 struct httpd_file_t
 {
@@ -449,6 +449,9 @@ struct httpd_file_t
 static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, httpd_message_t *answer, httpd_message_t *query )
 {
     httpd_file_t *file = (httpd_file_t*)p_sys;
+    uint8_t *psz_args = query->psz_args;
+    uint8_t **pp_body, *p_body;
+    int *pi_body, i_body;
 
     if( answer == NULL || query == NULL )
     {
@@ -466,15 +469,30 @@ static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
 
     if( query->i_type != HTTPD_MSG_HEAD )
     {
-        uint8_t *psz_args = query->psz_args;
-        if( query->i_type == HTTPD_MSG_POST )
-        {
-            /* Check that */
-            psz_args = query->p_body;
-        }
-        file->pf_fill( file->p_sys, file, psz_args, &answer->p_body,
-                       &answer->i_body );
+        pp_body = &answer->p_body;
+        pi_body = &answer->i_body;
+    }
+    else
+    {
+        /* The file still needs to be executed. */
+        p_body = NULL;
+        i_body = 0;
+        pp_body = &p_body;
+        pi_body = &i_body;
     }
+
+    if( query->i_type == HTTPD_MSG_POST )
+    {
+        /* msg_Warn not supported */
+    }
+
+    file->pf_fill( file->p_sys, file, psz_args, pp_body, pi_body );
+
+    if( query->i_type == HTTPD_MSG_HEAD && p_body != NULL )
+    {
+        free( p_body );
+    }
+
     /* We respect client request */
     if( strcmp( httpd_MsgGet( &cl->query, "Connection" ), "" ) )
     {
@@ -537,6 +555,164 @@ void httpd_FileDelete( httpd_file_t *file )
     free( file );
 }
 
+/*****************************************************************************
+ * High Level Functions: httpd_handler_t (for CGIs)
+ *****************************************************************************/
+struct httpd_handler_t
+{
+    httpd_url_t *url;
+
+    httpd_handler_callback_t pf_fill;
+    httpd_handler_sys_t      *p_sys;
+
+};
+
+static int httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, httpd_message_t *answer, httpd_message_t *query )
+{
+    httpd_handler_t *handler = (httpd_handler_t*)p_sys;
+    uint8_t *psz_args = query->psz_args;
+    char psz_remote_addr[100];
+
+    if( answer == NULL || query == NULL )
+    {
+        return VLC_SUCCESS;
+    }
+    answer->i_proto  = HTTPD_PROTO_NONE;
+    answer->i_type   = HTTPD_MSG_ANSWER;
+
+    /* We do it ourselves, thanks */
+    answer->i_status = 0;
+    answer->psz_status = NULL;
+
+    switch( cl->sock.ss_family )
+    {
+#ifdef HAVE_INET_PTON
+    case AF_INET:
+        inet_ntop( cl->sock.ss_family,
+                   &((struct sockaddr_in *)&cl->sock)->sin_addr,
+                   psz_remote_addr, sizeof(psz_remote_addr) );
+        break;
+    case AF_INET6:
+        inet_ntop( cl->sock.ss_family,
+                   &((struct sockaddr_in6 *)&cl->sock)->sin6_addr,
+                   psz_remote_addr, sizeof(psz_remote_addr) );
+        break;
+#else
+    case AF_INET:
+    {
+        char *psz_tmp = inet_ntoa( ((struct sockaddr_in *)&cl->sock)->sin_addr );
+        strncpy( psz_remote_addr, psz_tmp, sizeof(psz_remote_addr) );
+        break;
+    }
+#endif
+    default:
+        psz_remote_addr[0] = '\0';
+    }
+
+    handler->pf_fill( handler->p_sys, handler, query->psz_url, psz_args,
+                      query->i_type, query->p_body, query->i_body,
+                      psz_remote_addr, NULL,
+                      &answer->p_body, &answer->i_body );
+
+    if( query->i_type == HTTPD_MSG_HEAD )
+    {
+        char *p = answer->p_body;
+        while ( (p = strchr( p, '\r' )) != NULL )
+        {
+            if( p[1] && p[1] == '\n' && p[2] && p[2] == '\r'
+                 && p[3] && p[3] == '\n' )
+            {
+                break;
+            }
+        }
+        if( p != NULL )
+        {
+            p[4] = '\0';
+            answer->i_body = strlen(answer->p_body) + 1;
+            answer->p_body = realloc( answer->p_body, answer->i_body );
+        }
+    }
+
+    if( strncmp( answer->p_body, "HTTP/1.", 7 ) )
+    {
+        int i_status, i_headers;
+        char *psz_headers, *psz_new, *psz_status;
+        char psz_code[12];
+        if( !strncmp( answer->p_body, "Status: ", 8 ) )
+        {
+            /* Apache-style */
+            i_status = strtol( &answer->p_body[8], &psz_headers, 0 );
+            if( *psz_headers ) psz_headers++;
+            if( *psz_headers ) psz_headers++;
+            i_headers = answer->i_body - (psz_headers - (char *)answer->p_body);
+        }
+        else
+        {
+            i_status = 200;
+            psz_headers = answer->p_body;
+            i_headers = answer->i_body;
+        }
+        switch( i_status )
+        {
+        case 200:
+            psz_status = "OK";
+            break;
+        case 401:
+            psz_status = "Unauthorized";
+            break;
+        default:
+            psz_status = "Undefined";
+            break;
+        }
+        snprintf( psz_code, sizeof(psz_code), "%d", i_status );
+        answer->i_body = sizeof("HTTP/1.0  \r\n") + strlen(psz_code)
+                           + strlen(psz_status) + i_headers - 1;
+        psz_new = malloc( answer->i_body + 1);
+        sprintf( psz_new, "HTTP/1.0 %s %s\r\n", psz_code, psz_status );
+        memcpy( &psz_new[strlen(psz_new)], psz_headers, i_headers );
+        free( answer->p_body );
+        answer->p_body = psz_new;
+    }
+
+    return VLC_SUCCESS;
+}
+
+httpd_handler_t *httpd_HandlerNew( httpd_host_t *host, 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 *p_sys )
+{
+    httpd_handler_t *handler = malloc( sizeof( httpd_handler_t ) );
+
+    if( ( handler->url = httpd_UrlNewUnique( host, psz_url, psz_user,
+                                             psz_password, p_acl )
+        ) == NULL )
+    {
+        free( handler );
+        return NULL;
+    }
+
+    handler->pf_fill = pf_fill;
+    handler->p_sys   = p_sys;
+
+    httpd_UrlCatch( handler->url, HTTPD_MSG_HEAD, httpd_HandlerCallBack,
+                    (httpd_callback_sys_t*)handler );
+    httpd_UrlCatch( handler->url, HTTPD_MSG_GET,  httpd_HandlerCallBack,
+                    (httpd_callback_sys_t*)handler );
+    httpd_UrlCatch( handler->url, HTTPD_MSG_POST, httpd_HandlerCallBack,
+                    (httpd_callback_sys_t*)handler );
+
+    return handler;
+}
+
+void httpd_HandlerDelete( httpd_handler_t *handler )
+{
+    httpd_UrlDelete( handler->url );
+    free( handler );
+}
+
 /*****************************************************************************
  * High Level Functions: httpd_redirect_t
  *****************************************************************************/
@@ -1407,7 +1583,7 @@ static void httpd_ClientRecv( httpd_client_t *cl )
 
     if( cl->query.i_proto == HTTPD_PROTO_NONE )
     {
-        /* enought to see if it's rtp over rtsp or RTSP/HTTP */
+        /* enough to see if it's rtp over rtsp or RTSP/HTTP */
         i_len = httpd_NetRecv( cl, &cl->p_buffer[cl->i_buffer],
                                4 - cl->i_buffer );
         if( i_len > 0 )
@@ -1781,7 +1957,7 @@ static void httpd_ClientSend( httpd_client_t *cl )
 
     i_len = httpd_NetSend( cl, &cl->p_buffer[cl->i_buffer],
                            cl->i_buffer_size - cl->i_buffer );
-    if( i_len > 0 )
+    if( i_len >= 0 )
     {
         cl->i_activity_date = mdate();
         cl->i_buffer += i_len;
@@ -2117,6 +2293,14 @@ static void httpd_HostThread( httpd_host_t *host )
 
                                 if( !url->catch[i_msg].cb( url->catch[i_msg].p_sys, cl, answer, query ) )
                                 {
+                                    if( answer->i_proto == HTTPD_PROTO_NONE )
+                                    {
+                                        /* Raw answer from a CGI */
+                                        cl->i_buffer = cl->i_buffer_size;
+                                    }
+                                    else
+                                        cl->i_buffer = -1;
+
                                     /* only one url can answer */
                                     answer = NULL;
                                     if( cl->url == NULL )
@@ -2200,9 +2384,10 @@ static void httpd_HostThread( httpd_host_t *host )
                         }
 
                         answer->i_body = p - answer->p_body;
+                        cl->i_buffer = -1;  /* Force the creation of the answer in httpd_ClientSend */
                         httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
                     }
-                    cl->i_buffer = -1;  /* Force the creation of the answer in httpd_ClientSend */
+
                     cl->i_state = HTTPD_CLIENT_SENDING;
                 }
             }