projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If connect-max is reached, connection is refused.
[yazproxy-moved-to-github.git]
/
src
/
proxyp.h
diff --git
a/src/proxyp.h
b/src/proxyp.h
index
40ce6d1
..
1e62cca
100644
(file)
--- a/
src/proxyp.h
+++ b/
src/proxyp.h
@@
-1,7
+1,7
@@
-/* $Id: proxyp.h,v 1.11 2006-03-09 14:12:57 adam Exp $
- Copyright (c) 1998-2005, Index Data.
+/* $Id: proxyp.h,v 1.14 2006-03-30 10:35:15 adam Exp $
+ Copyright (c) 1998-2006, Index Data.
-This file is part of the yaz-proxy.
+This file is part of the yazproxy.
YAZ proxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
YAZ proxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-31,7
+31,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <objectlist.h>
#endif
#include <objectlist.h>
#endif
-#include <yaz++/record-cache.h>
+#include <yazpp/record-cache.h>
#include <yazproxy/proxy.h>
#include <yazproxy/module.h>
#include <yazproxy/proxy.h>
#include <yazproxy/module.h>
@@
-91,7
+91,6
@@
public:
int *limit_pdu,
int *limit_req,
int *limit_search,
int *limit_pdu,
int *limit_req,
int *limit_search,
- int *limit_connect,
int *target_idletime,
int *client_idletime,
int *max_clients,
int *target_idletime,
int *client_idletime,
int *max_clients,
@@
-102,13
+101,15
@@
public:
const char **authentication,
const char **negotiation_charset,
const char **negotiation_lang,
const char **authentication,
const char **negotiation_charset,
const char **negotiation_lang,
- const char **query_charset);
-
- void get_generic_info(int *log_mask, int *max_clients);
+ const char **query_charset,
+ const char **default_client_query_charset);
+
+ void get_generic_info(int *log_mask, int *max_clients,
+ int *max_connect);
void get_target_info(const char *name, const char **url,
int *limit_bw, int *limit_pdu, int *limit_req,
void get_target_info(const char *name, const char **url,
int *limit_bw, int *limit_pdu, int *limit_req,
- int *limit_search, int *limit_connect,
+ int *limit_search,
int *target_idletime, int *client_idletime,
int *max_clients,
int *keepalive_limit_bw, int *keepalive_limit_pdu,
int *target_idletime, int *client_idletime,
int *max_clients,
int *keepalive_limit_bw, int *keepalive_limit_pdu,
@@
-116,7
+117,8
@@
public:
const char **cql2rpn,
const char **negotiation_charset,
const char **negotiation_lang,
const char **cql2rpn,
const char **negotiation_charset,
const char **negotiation_lang,
- const char **query_charset);
+ const char **query_charset,
+ const char **default_client_query_charset);
const char *check_mime_type(const char *path);
int check_query(ODR odr, const char *name, Z_Query *query, char **addinfo);
const char *check_mime_type(const char *path);
int check_query(ODR odr, const char *name, Z_Query *query, char **addinfo);
@@
-190,6
+192,7
@@
class Yaz_ProxyClient : public yazpp_1::Z_Assoc {
ODR m_idAuthentication_odr;
void set_idAuthentication(Z_APDU *apdu);
bool compare_idAuthentication(Z_APDU *apdu);
ODR m_idAuthentication_odr;
void set_idAuthentication(Z_APDU *apdu);
bool compare_idAuthentication(Z_APDU *apdu);
+ bool compare_charset(Z_APDU *apdu);
};
/*
};
/*