Merge branch 'feature/configure-outbound_msg_retry' of git://github.com/countsudoku/unbound into countsudoku-feature/configure-outbound_msg_retry

testdata/fwd_error.rpl

@@ -9,7 +9,7 @@ SECTION QUESTION
 www.example.com. IN A
 ENTRY_END
 ; But the pending query fails due to error (say TCP failure or malloc or ...)
-; This is iterator/iterator.h OUTBOUND_MSG_RETRY number of errors.
+; This is util/config_file.c outbound-msg-retry number of errors.
 STEP 2 ERROR
 STEP 3 ERROR
 STEP 4 ERROR

testdata/fwd_error_retries.rpl

@@ -0,0 +1,27 @@
+; config options
+server:
+	outbound-msg-retry: 1
+
+forward-zone:
+	name: "."
+	forward-addr: 216.0.0.1
+CONFIG_END
+SCENARIO_BEGIN Test basic forwarding with servfail and retry of 1
+STEP 1 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+www.example.com. IN A
+ENTRY_END
+; query fails with servfail, now we make only outgoing-msg-retry=1 retries
+STEP 2 ERROR
+; returns servfail
+STEP 14 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH opcode qname qtype
+SECTION QUESTION
+REPLY SERVFAIL QR RD RA
+MATCH all
+www.example.com. IN A
+ENTRY_END
+SCENARIO_END

testdata/fwd_timeout.rpl

@@ -9,7 +9,7 @@ SECTION QUESTION
 www.example.com. IN A
 ENTRY_END
 ; But the pending query times out!
-; OUTBOUND_MSG_RETRY times timeout.
+; outbound-msg-retry times timeout.
 STEP 2 TIMEOUT
 STEP 3 TIMEOUT
 STEP 4 TIMEOUT