[vlc-commits] cdda: use http tunnelling mode and use port 80 for requests.

[Konstantin Pavlov]

vlc/vlc-2.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Mon Feb 20 11:52:42 2012 +0400| [e260571d8aca4329075c0f0f8cb26bc4f33c1bed] | committer: Konstantin Pavlov

cdda: use http tunnelling mode and use port 80 for requests.

Closes: #6081
(cherry picked from commit cb2ec4710b5eaacb32714be386ad2a738aa460af)

Signed-off-by: Konstantin Pavlov <thresh at videolan.org>

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

 modules/access/cdda.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index f782b0c..2f37026 100644
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -77,7 +77,7 @@ vlc_module_begin ()
 #ifdef HAVE_LIBCDDB
     add_string( "cddb-server", "freedb.videolan.org", N_( "CDDB Server" ),
             N_( "Address of the CDDB server to use." ), true )
-    add_integer( "cddb-port", 8880, N_( "CDDB port" ),
+    add_integer( "cddb-port", 80, N_( "CDDB port" ),
             N_( "CDDB Server port to use." ), true )
 #endif
 
@@ -602,6 +602,9 @@ static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sector
     }
 
     /* */
+
+    cddb_http_enable( p_cddb );
+
     char *psz_tmp = var_InheritString( p_access, "cddb-server" );
     if( psz_tmp )
     {
@@ -613,6 +616,9 @@ static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sector
 
     cddb_set_email_address( p_cddb, "vlc at videolan.org" );
 
+    cddb_set_http_path_query( p_cddb, "/~cddb/cddb.cgi" );
+    cddb_set_http_path_submit( p_cddb, "/~cddb/submit.cgi" );
+
     /// \todo
     cddb_cache_disable( p_cddb );
 
@@ -622,9 +628,6 @@ static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sector
 
     cddb_set_timeout( p_cddb, 10 );
 
-    /// \todo
-    cddb_http_disable( p_cddb );
-
     /* */
     cddb_disc_t *p_disc = cddb_disc_new();
     if( !p_disc )