Changeset 2149506c942876bb56cadc9448c64b2c558b6bd5

Timestamp:

04/05/07 23:48:04 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1178315284 +0000

git-parent:

[d849f0bc4be00adb17f707751dbe9b27158e09c6]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1178315284 +0000

Message:

* mmsh.c: Try using the http-proxy config option if mmsh-proxy wasn't set (Untested).

Files:

• modules/access/mms/mmsh.c (modified) (2 diffs)

modules/access/mms/mmsh.c

@@ -42 +42 @@
-
-/* TODO:
- *  - http_proxy
- *  - authentication
- */
@@ -105 +104 @@
-    /* TODO reuse instead http-proxy from http access ? */
-    psz_proxy = var_CreateGetString( p_access, "mmsh-proxy" );
+    if( !*psz_proxy )
+    {
+        char *psz_http_proxy = config_GetPsz( p_access, "http-proxy" );
+        if( psz_http_proxy && *psz_http_proxy )
+        {
+            free( psz_proxy );
+            psz_proxy = psz_http_proxy;
+            var_SetString( p_access, "mmsh-proxy", psz_proxy );
+        }
+        else
+        {
+            free( psz_http_proxy );
+        }
+    }
-    if( *psz_proxy )
-    {