X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fhttpd.c;h=7283060d62469dc5b5e63f9b1b172c0d3d035e95;hb=eb7856b7405bb1ae4472081760d89b6134fad464;hp=ec18c72ce44d49dd8285c3220ce76b9e4e5af7ae;hpb=6da90a1716250d282f16dc6bc9dacec5b9514caf;p=vlc

diff --git a/src/network/httpd.c b/src/network/httpd.c
index ec18c72ce4..7283060d62 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_httpd.h>
 
 #ifdef ENABLE_HTTPD
@@ -394,7 +394,6 @@ httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
                     httpd_message_t *answer, const 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;
     const char *psz_connection;
     int *pi_body, i_body;
@@ -431,6 +430,7 @@ httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
         /* msg_Warn not supported */
     }
 
+    uint8_t *psz_args = query->psz_args;
     file->pf_fill( file->p_sys, file, psz_args, pp_body, pi_body );
 
     if( query->i_type == HTTPD_MSG_HEAD && p_body != NULL )
@@ -520,7 +520,6 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
                        httpd_message_t *answer, const httpd_message_t *query )
 {
     httpd_handler_t *handler = (httpd_handler_t*)p_sys;
-    uint8_t *psz_args = query->psz_args;
     char psz_remote_addr[NI_MAXNUMERICHOST];
 
     if( answer == NULL || query == NULL )
@@ -536,6 +535,7 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
     if( httpd_ClientIP( cl, psz_remote_addr ) == NULL )
         *psz_remote_addr = '\0';
 
+    uint8_t *psz_args = query->psz_args;
     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,
@@ -996,14 +996,11 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
 
     /* to be sure to avoid multiple creation */
     var_Create( p_this->p_libvlc, "httpd_mutex", VLC_VAR_MUTEX );
-    var_Create( p_this->p_libvlc, "httpd_object", VLC_VAR_ADDRESS );
     var_Get( p_this->p_libvlc, "httpd_mutex", &lockval );
     vlc_mutex_lock( lockval.p_address );
-    var_Get( p_this->p_libvlc, "httpd_object", &ptrval );
+    httpd = libvlc_priv (p_this->p_libvlc)->p_httpd;
 
-    if( ptrval.p_address != NULL )
-        httpd = ptrval.p_address;
-    else
+    if( httpd == NULL )
     {
         msg_Info( p_this, "creating httpd" );
         httpd = (httpd_t *)vlc_custom_create( p_this, sizeof (*httpd),
@@ -1020,7 +1017,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
         httpd->host   = NULL;
 
         ptrval.p_address = httpd;
-        var_Set( p_this->p_libvlc, "httpd_object", ptrval );
+        libvlc_priv (p_this->p_libvlc)->p_httpd = httpd;
         vlc_object_yield( httpd );
         vlc_object_attach( httpd, p_this->p_libvlc );
     }
@@ -1197,12 +1194,9 @@ void httpd_HostDelete( httpd_host_t *host )
     vlc_object_release( httpd );
     if( httpd->i_host <= 0 )
     {
-        vlc_value_t ptrval;
-
         msg_Dbg( httpd, "no host left, stopping httpd" );
 
-        ptrval.p_address = NULL;
-        var_Set( httpd->p_libvlc, "httpd_object", ptrval );
+        libvlc_priv (httpd->p_libvlc)->p_httpd = NULL;
         vlc_object_detach( httpd );
         vlc_object_release( httpd );
 
@@ -2030,6 +2024,7 @@ static void httpd_HostThread( httpd_host_t *host )
     int evfd;
     bool b_die;
 
+retry:
     vlc_object_lock( host );
     evfd = vlc_object_waitpipe( VLC_OBJECT( host ) );
     b_die = !vlc_object_alive( host );
@@ -2041,7 +2036,7 @@ static void httpd_HostThread( httpd_host_t *host )
         {
             /* 0.2s (FIXME: use a condition variable) */
             msleep( 200000 );
-            continue;
+            goto retry;
         }
 
         /* prepare a new TLS session */
@@ -2458,7 +2453,7 @@ static void httpd_HostThread( httpd_host_t *host )
         {
             b_die = !vlc_object_alive( host );
             if( !b_die )
-                b_die = vlc_object_wait( host );
+                vlc_object_wait( host );
         }
         vlc_object_unlock( host );