From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 8 Dec 2011 09:28:44 +0000 (+0100)
Subject: zoom: honor content-proxy
X-Git-Tag: v1.3.18~4
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=901f5dac26098062f04ae8e647e06880e526abe9;p=metaproxy-moved-to-github.git

zoom: honor content-proxy
---

diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index 39c02e6..10a02c4 100644
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -722,6 +722,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     std::string authentication;
     std::string content_authentication;
     std::string proxy;
+    std::string content_proxy;
     std::string realm = m_p->default_realm;
 
     const char *param_user = 0;
@@ -757,6 +758,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
             param_content_user = value;
         else if (!strcmp(name, "content-password"))
             param_content_password = value;
+        else if (!strcmp(name, "content-proxy"))
+            content_proxy = value;
         else if (!strcmp(name, "proxy"))
             proxy = value;
         else if (!strcmp(name, "cproxysession"))
@@ -1016,7 +1019,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     if (*error == 0)
         create_content_session(package, b, error, addinfo, odr,
                                content_authentication.length() ?
-                               content_authentication : authentication, proxy);
+                               content_authentication : authentication,
+                               content_proxy.length() ? content_proxy : proxy);
     if (*error == 0)
         m_backend = b;
     return b;