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
Bundle sha1 rather than use libgcrypt/nettle
[yaz-moved-to-github.git]
/
src
/
zoom-p.h
diff --git
a/src/zoom-p.h
b/src/zoom-p.h
index
3cb9b80
..
79f2f44
100644
(file)
--- a/
src/zoom-p.h
+++ b/
src/zoom-p.h
@@
-36,9
+36,12
@@
#include <yaz/srw.h>
#include <yaz/cookie.h>
#include <yaz/mutex.h>
#include <yaz/srw.h>
#include <yaz/cookie.h>
#include <yaz/mutex.h>
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
+#if HAVE_LIBMEMCACHED
#include <libmemcached/memcached.h>
#endif
#include <libmemcached/memcached.h>
#endif
+#if HAVE_HIREDIS
+#include <hiredis/hiredis.h>
+#endif
#define SHPTR 1
#define SHPTR 1
@@
-80,6
+83,7
@@
struct ZOOM_connection_p {
int len_out;
char *proxy;
char *tproxy;
int len_out;
char *proxy;
char *tproxy;
+ int proxy_mode;
char *charset;
char *lang;
char *cookie_out;
char *charset;
char *lang;
char *cookie_out;
@@
-107,13
+111,19
@@
struct ZOOM_connection_p {
zoom_sru_mode sru_mode;
int no_redirects; /* 0 for no redirects. >0 for number of redirects */
yaz_cookies_t cookies;
zoom_sru_mode sru_mode;
int no_redirects; /* 0 for no redirects. >0 for number of redirects */
yaz_cookies_t cookies;
+ char *location;
int log_details;
int log_api;
WRBUF saveAPDU_wrbuf;
int log_details;
int log_api;
WRBUF saveAPDU_wrbuf;
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
+#if HAVE_LIBMEMCACHED
memcached_st *mc_st;
#endif
memcached_st *mc_st;
#endif
+#if HAVE_HIREDIS
+ redisContext *redis_c;
+#endif
+ int expire_search;
+ int expire_record;
};
typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
};
typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
@@
-237,6
+247,7
@@
zoom_ret ZOOM_connection_Z3950_send_init(ZOOM_connection c);
ZOOM_task ZOOM_connection_add_task(ZOOM_connection c, int which);
void ZOOM_connection_remove_task(ZOOM_connection c);
ZOOM_task ZOOM_connection_add_task(ZOOM_connection c, int which);
void ZOOM_connection_remove_task(ZOOM_connection c);
+void ZOOM_connection_remove_tasks(ZOOM_connection c);
int ZOOM_test_reconnect(ZOOM_connection c);
ZOOM_record ZOOM_record_cache_lookup(ZOOM_resultset r, int pos,
int ZOOM_test_reconnect(ZOOM_connection c);
ZOOM_record ZOOM_record_cache_lookup(ZOOM_resultset r, int pos,