Merge remote-tracking branch 'origin/master' into v320a_dev

exec/load/binkp.js

@@ -249,6 +249,10 @@ BinkP.prototype.send_chunks = function(str) {
 	var sent = 0;
 
 	while (sent < str.length) {
+		if (this.sock.poll(this.timeout, /* write: */true) == 0) {
+			log(LOG_WARNING, "TIMEOUT of socket poll() for write");
+			return false;
+		}
 		ret = this.sock.send(str.substr(sent));
 		if (ret > 0)
 			sent += ret;

src/sbbs3/un_qwk.cpp

@@ -166,8 +166,6 @@ bool sbbs_t::unpack_qwk(char *packet,uint hubnum)
 		n=(uint)block[123]|(((uint)block[124])<<8);  /* conference number */
 		if(blocks<2) {
 			if(block[0] == 'V' && blocks == 1 && voting != NULL) {	/* VOTING DATA */
-				if(qwk_msg_filtered(&msg, ip_can, host_can, subject_can, twit_list))
-					continue;
 				if(!qwk_voting(&voting, l, NET_QWK, cfg.qhub[hubnum]->id, n, hubnum)) {
 					lprintf(LOG_WARNING, "QWK vote failure, offset %lu in %s", l, packet);
 					errors++;

src/sbbs3/un_rep.cpp

@@ -197,8 +197,6 @@ bool sbbs_t::unpack_rep(char* repfile)
 		long confnum = atol((char *)block+1);
 		if(blocks<2) {
 			if(block[0] == 'V' && blocks == 1 && voting != NULL) {	/* VOTING DATA */
-				if(qwk_msg_filtered(&msg, ip_can, host_can, subject_can, twit_list))
-					continue;
 				if(!qwk_voting(&voting, l, (useron.rest&FLAG('Q')) ? NET_QWK : NET_NONE, /* QWKnet ID : */useron.alias, confnum)) {
 					lprintf(LOG_WARNING, "QWK vote failure, offset %ld of %s", l, getfname(msg_fname));
 					errors++;