projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
session_shared: match additionalSearchInfo (includes facets)
[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
7703a97
..
2e6a38f
100644
(file)
--- a/
src/filter_http_client.cpp
+++ b/
src/filter_http_client.cpp
@@
-50,10
+50,17
@@
namespace metaproxy_1 {
void proxy(mp::Package &package);
std::string proxy_host;
std::string default_host;
void proxy(mp::Package &package);
std::string proxy_host;
std::string default_host;
+ int max_redirects;
+ Rep();
};
}
}
};
}
}
+yf::HTTPClient::Rep::Rep()
+{
+ max_redirects = -0;
+}
+
yf::HTTPClient::HTTPClient() : m_p(new Rep)
{
}
yf::HTTPClient::HTTPClient() : m_p(new Rep)
{
}
@@
-71,11
+78,18
@@
void yf::HTTPClient::Rep::proxy(mp::Package &package)
Z_GDU *res_gdu = 0;
mp::odr o;
yaz_url_t yaz_url = yaz_url_create();
Z_GDU *res_gdu = 0;
mp::odr o;
yaz_url_t yaz_url = yaz_url_create();
- std::string uri;
+ const char *http_proxy =
+ z_HTTP_header_remove(&hreq->headers, "X-Metaproxy-Proxy");
+
+ if (!http_proxy)
+ http_proxy = proxy_host.c_str();
- if (proxy_host.length())
- yaz_url_set_proxy(yaz_url, proxy_host.c_str());
+ if (*http_proxy)
+ yaz_url_set_proxy(yaz_url, http_proxy);
+ yaz_url_set_max_redirects(yaz_url, max_redirects);
+
+ std::string uri;
if (hreq->path[0] == '/')
{
if (default_host.length())
if (hreq->path[0] == '/')
{
if (default_host.length())
@@
-92,11
+106,15
@@
void yf::HTTPClient::Rep::proxy(mp::Package &package)
if (http_response)
{
res_gdu = o.create_HTTP_Response(package.session(), hreq, 200);
if (http_response)
{
res_gdu = o.create_HTTP_Response(package.session(), hreq, 200);
+ z_HTTP_header_remove(&http_response->headers, "Transfer-Encoding");
res_gdu->u.HTTP_Response = http_response;
}
else
{
res_gdu->u.HTTP_Response = http_response;
}
else
{
- res_gdu = o.create_HTTP_Response(package.session(), hreq, 404);
+ res_gdu = o.create_HTTP_Response_details(
+ package.session(),
+ hreq, 502,
+ yaz_url_get_error(yaz_url));
}
package.response() = res_gdu;
yaz_url_destroy(yaz_url);
}
package.response() = res_gdu;
yaz_url_destroy(yaz_url);
@@
-125,6
+143,10
@@
void mp::filter::HTTPClient::configure(const xmlNode * ptr, bool test_only,
{
m_p->proxy_host = mp::xml::get_text(ptr);
}
{
m_p->proxy_host = mp::xml::get_text(ptr);
}
+ else if (!strcmp((const char *) ptr->name, "max-redirects"))
+ {
+ m_p->max_redirects = mp::xml::get_int(ptr, 0);
+ }
else if (!strcmp((const char *) ptr->name, "default-host"))
{
m_p->default_host = mp::xml::get_text(ptr);
else if (!strcmp((const char *) ptr->name, "default-host"))
{
m_p->default_host = mp::xml::get_text(ptr);