- make tar doesn't exclude tls*, but instead tls/*

- don't append -tls to the version number unless CORE_TLS is used
(there's enough information in the flags to see if support for the tls
 modules is enabled)

Makefile

@@ -203,10 +203,6 @@ utils_install=	utils/gen_ha1/gen_ha1 utils/serunix/serunix \
 
 ALLDEP=Makefile Makefile.sources Makefile.defs Makefile.rules
 
-# by default compile with tls hooks support (so that no ser recompile is
-#  needed before the tls module can be used)
-TLS_HOOKS=1
-
 #include general defs (like CC, CFLAGS  a.s.o)
 # hack to force makefile.defs re-inclusion (needed when make calls itself with
 # other options -- e.g. make bin)
@@ -239,7 +235,7 @@ tar_extra_args+=$(addprefix --exclude=$(notdir $(CURDIR))/, \
 ifeq ($(CORE_TLS), 1)
 	tar_extra_args+=
 else
-	tar_extra_args+=--exclude=$(notdir $(CURDIR))/tls* 
+	tar_extra_args+=--exclude=$(notdir $(CURDIR))/tls/* 
 endif
 
 ifneq ($(nodeb),)

Makefile.defs

@@ -113,7 +113,7 @@ ifeq ($(CORE_TLS), 1)
 	TLS_HOOKS:=0
 endif
 ifeq ($(TLS_HOOKS), 1)
-	RELEASE:=$(RELEASE)-tls
+#	RELEASE:=$(RELEASE)-tls
 endif
 
 # extra CC command line options (e.g  -march=athlon-mp)

tcp_main.c

@@ -1573,7 +1573,8 @@ inline static int handle_io(struct fd_map* fm, int idx)
 			ret=handle_ser_child((struct process_table*)fm->data, idx);
 			break;
 		case F_NONE:
-			LOG(L_CRIT, "BUG: handle_io: empty fd map\n");
+			LOG(L_CRIT, "BUG: handle_io: empty fd map: %p {%d, %d, %p},"
+						" idx %d\n", fm, fm->fd, fm->type, fm->data, idx);
 			goto error;
 		default:
 			LOG(L_CRIT, "BUG: handle_io: uknown fd type %d\n", fm->type);