Merge branch 'master' of git://github.com/janvidar/uhub

src/network/network.c

@@ -69,7 +69,7 @@ size_t net_get_max_sockets()
 	struct rlimit limits;
 	if (getrlimit(RLIMIT_NOFILE, &limits) == 0)
 	{
-		return limits.rlim_max;
+		return MIN(limits.rlim_max, 65536);
 	}
 	LOG_ERROR("getrlimit() failed");
 	return 1024;

src/util/misc.c

@@ -225,7 +225,6 @@ int file_read_lines(const char* file, void* data, file_line_handler_t handler)
 		
 		if (*start)
 		{
-			buf[strlen(start)] = 0;
 			LOG_DUMP("Line: %s", start);
 			if (handler(start, line_count+1, data) < 0)
 				return -1;