http_client: remove Transfer-Encoding from resp MK-445

[metaproxy-moved-to-github.git] / src / filter_http_client.cpp

diff --git a/src/filter_http_client.cpp b/src/filter_http_client.cpp
index fd6945b..74a1aa8 100644 (file)
--- a/src/filter_http_client.cpp
+++ b/src/filter_http_client.cpp
@@ -49,6 +49,7 @@ namespace metaproxy_1 {
             friend class HTTPClient;
             void proxy(mp::Package &package);
             std::string proxy_host;
+            std::string default_host;
         };
     }
 }
@@ -70,16 +71,35 @@ void yf::HTTPClient::Rep::proxy(mp::Package &package)
         Z_GDU *res_gdu = 0;
         mp::odr o;
         yaz_url_t yaz_url = yaz_url_create();
+        std::string uri;
 
         if (proxy_host.length())
             yaz_url_set_proxy(yaz_url, proxy_host.c_str());
-        Z_HTTP_Response *http_response =
-            yaz_url_exec(yaz_url, hreq->path, hreq->method,
+
+        if (hreq->path[0] == '/')
+        {
+            if (default_host.length())
+                uri = default_host + hreq->path;
+        }
+        else
+            uri = hreq->path;
+        Z_HTTP_Response *http_response = 0;
+        if (uri.length())
+            http_response =
+            yaz_url_exec(yaz_url, uri.c_str(), hreq->method,
                          hreq->headers, hreq->content_buf,
                          hreq->content_len);
         if (http_response)
         {
             res_gdu = o.create_HTTP_Response(package.session(), hreq, 200);
+            Z_HTTP_Header **hp = &http_response->headers;
+            while (*hp)
+            {
+                if (!yaz_matchstr((*hp)->name, "Transfer-Encoding"))
+                    *hp = (*hp)->next;
+                else
+                    hp = &(*hp)->next;
+            }
             res_gdu->u.HTTP_Response = http_response;
         }
         else
@@ -113,12 +133,22 @@ void mp::filter::HTTPClient::configure(const xmlNode * ptr, bool test_only,
         {
             m_p->proxy_host = mp::xml::get_text(ptr);
         }
+        else if (!strcmp((const char *) ptr->name, "default-host"))
+        {
+            m_p->default_host = mp::xml::get_text(ptr);
+            if (m_p->default_host.find("://") == std::string::npos)
+            {
+                throw mp::filter::FilterException
+                    ("default-host is missing method (such as http://)"
+                     " in http_client filter");
+            }
+        }
         else
         {
             throw mp::filter::FilterException
                 ("Bad element "
                  + std::string((const char *) ptr->name)
-                 + " in virt_db filter");
+                 + " in http_client filter");
         }
     }
 }