projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
[yaz-moved-to-github.git]
/
src
/
zoom-c.c
diff --git
a/src/zoom-c.c
b/src/zoom-c.c
index
dc52963
..
3615ed9
100644
(file)
--- a/
src/zoom-c.c
+++ b/
src/zoom-c.c
@@
-70,8
+70,9
@@
void ZOOM_set_dset_error(ZOOM_connection c, int error,
}
if (addinfo && addinfo2)
{
}
if (addinfo && addinfo2)
{
- c->addinfo = (char*) xmalloc(strlen(addinfo) + strlen(addinfo2) + 2);
+ c->addinfo = (char*) xmalloc(strlen(addinfo) + strlen(addinfo2) + 3);
strcpy(c->addinfo, addinfo);
strcpy(c->addinfo, addinfo);
+ strcat(c->addinfo, ": ");
strcat(c->addinfo, addinfo2);
}
else if (addinfo)
strcat(c->addinfo, addinfo2);
}
else if (addinfo)
@@
-266,6
+267,7
@@
ZOOM_API(ZOOM_connection)
c->host_port = 0;
c->proxy = 0;
c->host_port = 0;
c->proxy = 0;
+ c->tproxy = 0;
c->charset = c->lang = 0;
c->charset = c->lang = 0;
@@
-388,6
+390,16
@@
ZOOM_API(void)
c->proxy = xstrdup(val);
}
c->proxy = xstrdup(val);
}
+ xfree(c->tproxy);
+ c->tproxy = 0;
+ val = ZOOM_options_get(c->options, "tproxy");
+ if (val && *val)
+ {
+ yaz_log(c->log_details, "%p ZOOM_connection_connect tproxy=%s", c, val);
+ c->tproxy = xstrdup(val);
+ }
+
+
xfree(c->charset);
c->charset = 0;
val = ZOOM_options_get(c->options, "charset");
xfree(c->charset);
c->charset = 0;
val = ZOOM_options_get(c->options, "charset");
@@
-590,6
+602,7
@@
ZOOM_API(void)
ZOOM_connection_remove_events(c);
xfree(c->host_port);
xfree(c->proxy);
ZOOM_connection_remove_events(c);
xfree(c->host_port);
xfree(c->proxy);
+ xfree(c->tproxy);
xfree(c->charset);
xfree(c->lang);
xfree(c->cookie_out);
xfree(c->charset);
xfree(c->lang);
xfree(c->cookie_out);
@@
-1044,7
+1057,8
@@
static zoom_ret do_connect_host(ZOOM_connection c, const char *logical_url)
if (c->cs)
cs_close(c->cs);
if (c->cs)
cs_close(c->cs);
- c->cs = cs_create_host_proxy(logical_url, 0, &add, c->proxy);
+ c->cs = cs_create_host_proxy(logical_url, 0, &add,
+ c->tproxy ? c->tproxy : c->proxy);
if (c->cs && c->cs->protocol == PROTO_HTTP)
{
if (c->cs && c->cs->protocol == PROTO_HTTP)
{