Merge remote-tracking branch 'fly/master'

place/berlin.c

@@ -1,2 +1,4 @@
 #define PLACE_HISTORY_EXPORT
+#define PLACE_SCRATCHPAD
+#define SECURE
 #include <place.gen>

place/git.c

@@ -0,0 +1,9 @@
+#include <net.h>
+#define NAME "git"
+
+//#ifdef BRAIN
+# define REDIRECT "psyc://psyced.org/@PSYC"
+//#endif
+
+#include <place.gen>	// now generate the place according to the rules
+

world/default/de/html.textdb

@@ -722,6 +722,11 @@ _PAGES_help_settings
 |Mit "<b>/set filter off</b>" kann der private Firewall wieder abgeschaltet
 |werden. "<b>default</b>" geht auf die Voreinstellung zurück.
 |
+|<a name="loginhistory"></a>
+|<DT><P><B> /set loginhistory &lt;Anzahl&gt;</B></p><dd>
+|taugt zur Einschränkung wieviele Nachrichten aus der Historie vergangener
+|öffentlicher Nachrichten beim Einloggvorgang dargestellt werden.
+|
 |<a name="presencefilter"></a>
 |<DT><P><B> /set presencefilter [ on | off | all | automatic ] </B></p><dd>
 |hilft die Menge an Anwesenheit- und Abwesenheitsbekundungen in Zaum zu

world/default/en/html.textdb

@@ -203,6 +203,11 @@ _PAGES_help_display
 |wait to meet you in a room. "<b>default</b>" resets this value to
 |the local default.
 |
+|<a name="loginhistory"></a>
+|<DT><P><B> /set loginhistory &lt;amount&gt;</B></p><dd>
+|lets you define an upper limit in the number of history
+|messages you want to see when logging into the server.
+|
 |</dl>
 |{_HTML_info_split}
 |<dl>

world/net/circuit.c

@@ -261,29 +261,31 @@ runQ() {
 }
 
 connect(ho, po, transport, srv, extra) {
+#ifndef _flag_disable_network_circuit_connect
 	if (interactive()) return -8;
 	P3(("connect: %O, %O, %O, %O for %O\n", ho, po, transport, srv, ME))
 	if (time() < time_of_connect_attempt + waitforme) return -2;
 	if (ho) {	// paranoid: stringp(ho) && strlen(ho)) {
 		if (po) port = po;
-#ifndef ERQ_WITHOUT_SRV
+# ifndef ERQ_WITHOUT_SRV
 		if (srv) {
 		    hostname = lower_case(ho);
 		    host = 0;
 		} else 
-#endif
+# endif
 		host = lower_case(ho);
 		P2(("connect.%s:\t%O, %O, %O\t%O\n", srv || "to",
 				 ho, po, transport, ME))
 	}
-#ifndef ERQ_WITHOUT_SRV
+# ifndef ERQ_WITHOUT_SRV
 	P4(("connect->srv_choose? depends on srv %O\n", srv))
 	if (srv) return dns_srv_resolve(hostname, srv,    // _psyc._tls.domain
 			transport == "s" ? "tls" : "tcp", #'srv_choose,
 		       	transport);
-#endif
+# endif
 	if (::connect(host, port, transport, extra) >= 0)
 	     time_of_connect_attempt = time();
+#endif
 }
 
 disconnected(remaining) {

world/net/http/server.c

@@ -114,6 +114,7 @@ process_header() {
 
 parse_request(input) {
 	P0(("=== HTTP got: %O from %O\n", input, query_ip_name(ME)))
+	if (input == "HEAD / HTTP/1.1") return 1;
 
         if (!input || input=="") {
                 // should return error?

world/net/include/net.h

@@ -53,7 +53,8 @@
 # define DEFAULT_CONTENT_TYPE	"text/html; charset=" SYSTEM_CHARSET
 #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
 // this results in lots of conversions some of which look like
 // system->utf­>system->utf. luckily UTF8 is our system charset.
@@ -224,7 +225,10 @@
 # define WANT_S2S_TLS
 # define WANT_S2S_SASL
 # 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 MUCSUC
 //# define XMPP_BIDI

world/net/irc/user.c

@@ -897,7 +897,7 @@ logon() {
 	// version strings, only IRC makes it terribly complicated and
 	// even political. oh of course, that's because on irc the server
 	// admin isn't necessarily a person of your trusting.
-	w("_request_version", 0, 0, SERVER_UNIFORM);
+	w("_request_version"); //, 0, 0, SERVER_UNIFORM);
 # endif
 #endif
 	return rc;

world/net/jabber/user.c

@@ -672,12 +672,13 @@ iq(XMLNode node) {
     case "jabber:iq:roster":
 	switch(node["@type"]) {
 	case "get":
-	    // TODO: this assumes that to is unset and the query is 
+	    // TODO: this assumes that 'to' is unset and the query is 
-	    // to itself
+	    // to itself. we sometimes get here without a valid tag -
+	    // what should we do then?
 	    hasroster = 1; 
 	    packet = sprintf("<iq type='result' to='%s' id='%s'>"
 			     "<query xmlns='jabber:iq:roster'>",
-			     myjid, tag);
+			     myjid, stringp(tag)? tag: "");
 	    // TODO: listAcq does the same basically
 	    foreach (friend : ppl) {
 		mixed *u;

world/net/library/profiles.html

@@ -24,6 +24,7 @@
 <tr><td>_address_street</td><td>street</td><td>street</td><td>STREET</td><td>ADR/STREET</td><td>street</td><td></td></tr>
 <tr><td>_address_zone_time</td><td>timezone</td><td></td><td>TZ</td><td>TZ</td><td></td><td></td></tr>
 <tr><td>_affiliation</td><td>affiliation</td><td>org_name</td><td>ORGNAME</td><td>ORG/ORGNAME</td><td>o</td><td></td></tr>
+<tr><td>_amount_history_login</td><td>loginhistory</td><td></td><td></td><td></td><td></td><td></td></tr>
 <tr><td>_character_action</td><td>actioncharacter</td><td></td><td></td><td></td><td></td><td></td></tr>
 <tr><td>_character_command</td><td>commandcharacter</td><td></td><td></td><td></td><td></td><td></td></tr>
 <tr><td>_color</td><td>color</td><td></td><td></td><td></td><td></td><td></td></tr>

world/net/library/profiles.i

@@ -166,6 +166,7 @@ volatile mapping psyc2set = ([
                       "_address_street" : "street",
                    "_address_zone_time" : "timezone",
                          "_affiliation" : "affiliation",
+                "_amount_history_login" : "loginhistory",
                     "_character_action" : "actioncharacter",
                    "_character_command" : "commandcharacter",
                                "_color" : "color",
@@ -288,6 +289,7 @@ volatile mapping set2psyc = ([
               "street" : "_address_street",
             "timezone" : "_address_zone_time",
          "affiliation" : "_affiliation",
+        "loginhistory" : "_amount_history_login",
      "actioncharacter" : "_character_action",
     "commandcharacter" : "_character_command",
                "color" : "_color",

world/net/library/profiles.pl

@@ -21,7 +21,7 @@ while (<main::DATA>) {
 		$_ = $psyc = $1;
 		$psyc{$psyc} = 1;
 		next if /^_INTERNAL/;
-		s/_(address|contact|voice|scheme|source|flag|person|select)//g;
+		s/_(address|amount|contact|voice|scheme|source|flag|person|select)//g;
 		s/_date/_day/g;
 		s/_description/_text/g;
 		s/_favorite/_fave/g;
@@ -633,6 +633,9 @@ jProf	places_lived
 PSYC	_place_home
 set	home
 
+PSYC	_amount_history_login
+#set	loginhistory
+
 PSYC	_flag_filter_strangers
 set	filter
 

world/net/user.c

@@ -1728,7 +1728,8 @@ autojoin() {
 			// says it, too.
 #  endif
 		teleport(v("place"), "_login", 0, 0, ([ "_amount_history":
-			  _limit_amount_history_place_default ]));
+		      v("loginhistory") ? to_int(v("loginhistory"))
+		      : _limit_amount_history_place_default ]));
 # endif
 		// subscriptions are stored in lowercase, warum auch immer
 		if (sizeof(v("subscriptions"))) {
@@ -1780,7 +1781,7 @@ quit(immediate, variant) {
 	int stayinalive = 0;
 
      // so, SUBSCRIBE_PERMANENT won't work for now.
-	if (sizeof(v("subscriptions")) && widthof(v("subscriptions"))) {
+	if (mappingp(v("subscriptions")) && sizeof(v("subscriptions")) && widthof(v("subscriptions"))) {
 	    foreach (o, s : places) {
 		P3(("Stay in %O, %O?\n", o, s))
 		if (v("subscriptions")[lower_case(s)] != SUBSCRIBE_PERMANENT)

world/net/usercmd.i

@@ -2745,6 +2745,10 @@ checkVar(key, value) {
 		if (value == "off" || value == "-") value = "-";
 		else if (value) value = "on";
 		break;
+	case "loginhistory":
+		// zero is an intentional value in this case
+		if (value == "0") break;
+		// fall through
 	case "postalcode":	// integer settings
 	case "latitude":
 	case "longitude":