mirror of git://git.psyced.org/git/psyced
_flag_disable_network_circuit_connect, _flag_disable_idna_stringprep, no PERSISTENT_MASTERS
This commit is contained in:
parent
04a4908877
commit
2e459558f5
|
@ -261,6 +261,7 @@ runQ() {
|
||||||
}
|
}
|
||||||
|
|
||||||
connect(ho, po, transport, srv, extra) {
|
connect(ho, po, transport, srv, extra) {
|
||||||
|
#ifndef _flag_disable_network_circuit_connect
|
||||||
if (interactive()) return -8;
|
if (interactive()) return -8;
|
||||||
P3(("connect: %O, %O, %O, %O for %O\n", ho, po, transport, srv, ME))
|
P3(("connect: %O, %O, %O, %O for %O\n", ho, po, transport, srv, ME))
|
||||||
if (time() < time_of_connect_attempt + waitforme) return -2;
|
if (time() < time_of_connect_attempt + waitforme) return -2;
|
||||||
|
@ -284,6 +285,7 @@ connect(ho, po, transport, srv, extra) {
|
||||||
# endif
|
# endif
|
||||||
if (::connect(host, port, transport, extra) >= 0)
|
if (::connect(host, port, transport, extra) >= 0)
|
||||||
time_of_connect_attempt = time();
|
time_of_connect_attempt = time();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
disconnected(remaining) {
|
disconnected(remaining) {
|
||||||
|
|
|
@ -114,6 +114,7 @@ process_header() {
|
||||||
|
|
||||||
parse_request(input) {
|
parse_request(input) {
|
||||||
P0(("=== HTTP got: %O from %O\n", input, query_ip_name(ME)))
|
P0(("=== HTTP got: %O from %O\n", input, query_ip_name(ME)))
|
||||||
|
if (input == "HEAD / HTTP/1.1") return 1;
|
||||||
|
|
||||||
if (!input || input=="") {
|
if (!input || input=="") {
|
||||||
// should return error?
|
// should return error?
|
||||||
|
|
|
@ -53,7 +53,8 @@
|
||||||
# define DEFAULT_CONTENT_TYPE "text/html; charset=" SYSTEM_CHARSET
|
# define DEFAULT_CONTENT_TYPE "text/html; charset=" SYSTEM_CHARSET
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if __EFUN_DEFINED__(idna_stringprep) && defined(DRIVER_PATH)
|
// 2018-05 tmp disabled stringprep:
|
||||||
|
#if __EFUN_DEFINED__(idna_stringprep) && defined(DRIVER_PATH) && !defined(_flag_disable_idna_stringprep)
|
||||||
// stringprep needs utf8 arguments
|
// stringprep needs utf8 arguments
|
||||||
// this results in lots of conversions some of which look like
|
// this results in lots of conversions some of which look like
|
||||||
// system->utf>system->utf. luckily UTF8 is our system charset.
|
// system->utf>system->utf. luckily UTF8 is our system charset.
|
||||||
|
@ -221,7 +222,10 @@
|
||||||
# define WANT_S2S_TLS
|
# define WANT_S2S_TLS
|
||||||
# define WANT_S2S_SASL
|
# define WANT_S2S_SASL
|
||||||
# define ENTER_MEMBERS
|
# define ENTER_MEMBERS
|
||||||
# define PERSISTENT_MASTERS
|
// disabled 2018-05 due to stringprep messing up the _routes
|
||||||
|
// data structures *and* plenty of karteileichen which means
|
||||||
|
// that clean-up of _routes is not working!!
|
||||||
|
//# define PERSISTENT_MASTERS
|
||||||
# define NEW_RENDER
|
# define NEW_RENDER
|
||||||
# define MUCSUC
|
# define MUCSUC
|
||||||
//# define XMPP_BIDI
|
//# define XMPP_BIDI
|
||||||
|
|
Loading…
Reference in New Issue