X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_http_client.cpp;h=7703a97a9d52e752287483d0259b7e6d72d68a87;hb=15b0ee3b555ce9fdb416e78836209841efc6e596;hp=fd6945b6b8e25a705a67004a16ee125ced441c08;hpb=409c020044df74e1883710cbc1f2860dee8c5ac4;p=metaproxy-moved-to-github.git diff --git a/src/filter_http_client.cpp b/src/filter_http_client.cpp index fd6945b..7703a97 100644 --- 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,11 +71,22 @@ 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) @@ -113,12 +125,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"); } } }