Squid don't seem to like
GET /?operation.. HTTP/1.1
but rather
GET http://host/?operation HTTP/1.1
When HTTP proxy is in effect. When proxying the new function
cs_create_host_proxy is used to so comstack type is determined from
logical URL rather than proxy host. Proxy just needs host:port type of
spec. Note: this change might break HTTP redirect.
const char *host, int portnum)
{
const char *val;
const char *host, int portnum)
{
const char *val;
c->async = ZOOM_options_get_bool(c->options, "async", 0);
yaz_log(c->log_details, "%p ZOOM_connection_connect async=%d", c, c->async);
c->async = ZOOM_options_get_bool(c->options, "async", 0);
yaz_log(c->log_details, "%p ZOOM_connection_connect async=%d", c, c->async);
- task = ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT);
+ ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT);
}
static zoom_ret do_connect_host(ZOOM_connection c,
}
static zoom_ret do_connect_host(ZOOM_connection c,
- const char *effective_host,
const char *logical_url);
static zoom_ret do_connect(ZOOM_connection c)
{
const char *logical_url);
static zoom_ret do_connect(ZOOM_connection c)
{
- const char *effective_host;
-
- if (c->proxy)
- effective_host = c->proxy;
- else
- effective_host = c->host_port;
- return do_connect_host(c, effective_host, c->host_port);
+ return do_connect_host(c, c->host_port);
-static zoom_ret do_connect_host(ZOOM_connection c, const char *effective_host,
- const char *logical_url)
+static zoom_ret do_connect_host(ZOOM_connection c, const char *logical_url)
- yaz_log(c->log_details, "%p do_connect effective_host=%s", c, effective_host);
-
if (c->cs)
cs_close(c->cs);
if (c->cs)
cs_close(c->cs);
- c->cs = cs_create_host(effective_host, 0, &add);
-
+ c->cs = cs_create_host_proxy(logical_url, 0, &add, c->proxy);
+
if (c->cs && c->cs->protocol == PROTO_HTTP)
{
#if YAZ_HAVE_XML2
if (c->cs && c->cs->protocol == PROTO_HTTP)
{
#if YAZ_HAVE_XML2
+ c->proto = PROTO_HTTP;
+ xfree(c->path);
+ if (c->proxy)
+ {
+ c->path = xstrdup(logical_url);
+ }
+ else
cs_get_host_args(logical_url, &db);
cs_get_host_args(logical_url, &db);
c->path = xmalloc(strlen(db) * 3 + 2);
yaz_encode_sru_dbpath_buf(c->path, db);
c->path = xmalloc(strlen(db) * 3 + 2);
yaz_encode_sru_dbpath_buf(c->path, db);
{
/* since redirect may change host we just reconnect. A smarter
implementation might check whether it's the same server */
{
/* since redirect may change host we just reconnect. A smarter
implementation might check whether it's the same server */
- do_connect_host(c, location, 0);
+ do_connect_host(c, location);
send_HTTP_redirect(c, location, hres);
/* we're OK for now. Operation is not really complete */
ret = 0;
send_HTTP_redirect(c, location, hres);
/* we're OK for now. Operation is not really complete */
ret = 0;