[vlc-commits] commit: Fix Server: HTTP and RTSP header syntax ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 29 19:15:03 2010 +0300| [c114133f2212725d9fcaa66f3ed307e6563b7013] | committer: Rémi Denis-Courmont 

Fix Server: HTTP and RTSP header syntax

(cherry picked from commit cdb6faf0d09605a6af1216b4f75872ca3de8dcdc)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=c114133f2212725d9fcaa66f3ed307e6563b7013
---

 modules/misc/rtsp.c       |    4 ++--
 modules/stream_out/rtsp.c |    2 +-
 src/network/httpd.c       |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index ab3343d..266caa2 100644
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -1275,7 +1275,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             return VLC_EGENERIC;
     }
 
-    httpd_MsgAdd( answer, "Server", "VLC Server" );
+    httpd_MsgAdd( answer, "Server", "VLC/%s", VERSION );
     httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
     psz_cseq = httpd_MsgGet( query, "Cseq" );
     psz_cseq ? i_cseq = atoi( psz_cseq ) : 0;
@@ -1513,7 +1513,7 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             break;
     }
 
-    httpd_MsgAdd( answer, "Server", "VLC Server" );
+    httpd_MsgAdd( answer, "Server", "VLC/%s", VERSION );
     httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
     psz_cseq = httpd_MsgGet( query, "Cseq" );
     if (psz_cseq)
diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c
index e237c03..a1cc953 100644
--- a/modules/stream_out/rtsp.c
+++ b/modules/stream_out/rtsp.c
@@ -398,7 +398,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
     answer->i_body = 0;
     answer->p_body = NULL;
 
-    httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING );
+    httpd_MsgAdd( answer, "Server", "VLC/%s", VERSION );
 
     /* Date: is always allowed, and sometimes mandatory with RTSP/2.0. */
     struct tm ut;
diff --git a/src/network/httpd.c b/src/network/httpd.c
index 271ee04..2e95eed 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -2144,7 +2144,7 @@ static void* httpd_HostThread( void *data )
                     answer->i_body = 0;
                     answer->p_body = NULL;
 
-                    httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING );
+                    httpd_MsgAdd( answer, "Server", "VLC/%s", VERSION );
                     httpd_MsgAdd( answer, "Content-Length", "0" );
 
                     switch( query->i_proto )