mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Make options piggyback and timeout work with ZOOM
This commit is contained in:
parent
91f585744f
commit
e1a8983287
@ -166,6 +166,7 @@ static Yaz_Association yaz_association_mk ()
|
|||||||
p->zoom_scan = 0;
|
p->zoom_scan = 0;
|
||||||
p->zoom_package = 0;
|
p->zoom_package = 0;
|
||||||
ZOOM_connection_option_set(p->zoom_conn, "implementationName", "PHP");
|
ZOOM_connection_option_set(p->zoom_conn, "implementationName", "PHP");
|
||||||
|
ZOOM_connection_option_set(p->zoom_conn, "async", "1");
|
||||||
#else
|
#else
|
||||||
p->host_port = 0;
|
p->host_port = 0;
|
||||||
p->num_databaseNames = 0;
|
p->num_databaseNames = 0;
|
||||||
@ -1282,6 +1283,7 @@ PHP_FUNCTION(yaz_connect)
|
|||||||
option_set (as, "otherInfo1", otherInfo[1]);
|
option_set (as, "otherInfo1", otherInfo[1]);
|
||||||
option_set (as, "otherInfo2", otherInfo[2]);
|
option_set (as, "otherInfo2", otherInfo[2]);
|
||||||
option_set (as, "proxy", proxy_str);
|
option_set (as, "proxy", proxy_str);
|
||||||
|
option_set (as, "piggyback", piggyback ? "1" : "0");
|
||||||
ZOOM_connection_connect (as->zoom_conn, zurl_str, 0);
|
ZOOM_connection_connect (as->zoom_conn, zurl_str, 0);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -1336,6 +1338,7 @@ PHP_FUNCTION(yaz_connect)
|
|||||||
option_set (as, "otherInfo1", otherInfo[1]);
|
option_set (as, "otherInfo1", otherInfo[1]);
|
||||||
option_set (as, "otherInfo2", otherInfo[2]);
|
option_set (as, "otherInfo2", otherInfo[2]);
|
||||||
option_set (as, "proxy", proxy_str);
|
option_set (as, "proxy", proxy_str);
|
||||||
|
option_set (as, "piggyback", piggyback ? "1" : "0");
|
||||||
|
|
||||||
ZOOM_connection_connect (as->zoom_conn, zurl_str, 0);
|
ZOOM_connection_connect (as->zoom_conn, zurl_str, 0);
|
||||||
#else
|
#else
|
||||||
@ -1564,7 +1567,13 @@ PHP_FUNCTION(yaz_wait)
|
|||||||
#if USE_ZOOM
|
#if USE_ZOOM
|
||||||
Yaz_Association p = shared_associations[i];
|
Yaz_Association p = shared_associations[i];
|
||||||
if (p && p->order == YAZSG(assoc_seq))
|
if (p && p->order == YAZSG(assoc_seq))
|
||||||
|
{
|
||||||
|
char str[20];
|
||||||
|
|
||||||
|
sprintf (str, "%d", timeout);
|
||||||
|
ZOOM_connection_option_set (p->zoom_conn, "timeout", str);
|
||||||
conn_ar[no++] = p->zoom_conn;
|
conn_ar[no++] = p->zoom_conn;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
Yaz_Association p = shared_associations[i];
|
Yaz_Association p = shared_associations[i];
|
||||||
if (!p || p->order != YAZSG(assoc_seq) || !p->action
|
if (!p || p->order != YAZSG(assoc_seq) || !p->action
|
||||||
|
Loading…
Reference in New Issue
Block a user