Comparison

Merge 0.9->0.10

comparison

equal deleted inserted replaced

-:7aa37d70944b
+:5286e79c6829
 	-- remember the query
 	self.active[id] = self.active[id] or {};
 	self.active[id][question] = o;
+	local conn, err = self:getsocket(o.server)
+	if not conn then
+		return nil, err;
+	end
+	conn:send (o.packet)
 	-- remember which coroutine wants the answer
 	if co then
 		set(self.wanted, qclass, qtype, qname, co, true);
 	end
-	local conn, err = self:getsocket(o.server)
-	if not conn then
-		return nil, err;
-	end
-	conn:send (o.packet)
 	if timer and self.timeout then
 		local num_servers = #self.server;
 		local i = 1;
 		timer.add_task(self.timeout, function ()
 			if get(self.wanted, qclass, qtype, qname, co) then
 					end
 					-- retire the query
 					local queries = self.active[response.header.id];
 					queries[response.question.raw] = nil;
 					if not next(queries) then self.active[response.header.id] = nil; end
 					if not next(self.active) then self:closeall(); end
 					-- was the query on the wanted list?
 					local q = response.question[1];
 							if coroutine.status(co) == "suspended" then coroutine.resume(co); end
 						end
 						set(self.wanted, q.class, q.type, q.name, nil);
 					end
 				end
 			end
 		end
 	end
 	return response;