From 8314791c9e80cafb4efa68442dd99bb38f64f793 Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Thu, 16 Jan 2014 20:22:38 -0800
Subject: [PATCH] test: nginx: Adds timeout while listening for a socket.

---
 tests/run-regression-tests-nginx.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/run-regression-tests-nginx.pl b/tests/run-regression-tests-nginx.pl
index 509ef367..6e4af858 100755
--- a/tests/run-regression-tests-nginx.pl
+++ b/tests/run-regression-tests-nginx.pl
@@ -387,6 +387,9 @@ sub do_raw_request {
 			) or msg("Failed to connect to localhost:$opt{p}: $@");
 	return unless ($sock);
 
+	my $timeo = pack("qq", 2, 0);
+	$sock->sockopt(SO_RCVTIMEO, $timeo);
+
 # Join togeather the request
 	my $r = join("", @_);
 	dbg($r);
@@ -777,7 +780,7 @@ sub nginx_start {
 	}
 
 	# Look for startup msworker cycleg
-	unless (defined match_log("error", qr/setproctitle: "nginx: worker process"/, 60, "worker cycle")) {
+	unless (defined match_log("error", qr/start worker process/, 60)) {
 		vrb(join(" ", map { quote_shell($_) } @p));
 		msg("Nginx server failed to start.");
 		nginx_stop();