From 3d954e4e2638fc29a952ebaf1ef235fa2e98ee61 Mon Sep 17 00:00:00 2001
From: Jay Satiro <raysatiro@yahoo.com>
Date: Fri, 19 Feb 2021 18:30:18 -0500
Subject: [PATCH] test1188: Check for --fail HTTP status

- Change the test to check for curl error on HTTP 404 Not Found.

test1188 tests "--write-out with %{onerror} and %{urlnum} to stderr".
Prior to this change it did that by specifying a non-existent host which
would cause an error. ISPs may hijack DNS and resolve non-existent hosts
so the test would not work if that was the case.

Ref: https://en.wikipedia.org/wiki/DNS_hijacking#Manipulation_by_ISPs
Ref: https://github.com/curl/curl/issues/6621
Ref: https://github.com/curl/curl/pull/6623

Closes https://github.com/curl/curl/pull/6637
---
 tests/data/test1188 | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/data/test1188 b/tests/data/test1188
index 8912b391a..6078ee483 100644
--- a/tests/data/test1188
+++ b/tests/data/test1188
@@ -9,12 +9,11 @@ HTTP GET
 
 # Server-side
 <reply>
-<data nocheck="yes">
-HTTP/1.1 200 OK
-Content-Length: 3
+<data>
+HTTP/1.1 404 Not Found
+Content-Length: 0
 Connection: close
 
-hi
 </data>
 </reply>
 
@@ -27,7 +26,7 @@ http
 --write-out with %{onerror} and %{urlnum} to stderr
  </name>
 <command>
-http://non-existing-host.haxx.se:%NOLISTENPORT/we/want/our/1188 http://%HOSTIP:%HTTPPORT/we/want/our/1188 -w '%{onerror}%{stderr}%{urlnum} says %{exitcode} %{errormsg}\n' -s
+-f -s -w '%{onerror}%{stderr}%{urlnum} says %{exitcode} %{errormsg}\n' http://%HOSTIP:%HTTPPORT/we/want/our/1188 http://%HOSTIP:%HTTPPORT/we/want/our/1188
 </command>
 </client>
 
@@ -39,9 +38,19 @@ Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
+GET /we/want/our/1188 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stderr mode="text">
-0 says 6 Could not resolve host: non-existing-host.haxx.se
+0 says 22 The requested URL returned error: 404
+1 says 22 The requested URL returned error: 404
 </stderr>
+# 22 is CURLE_HTTP_RETURNED_ERROR
+<errorcode>
+22
+</errorcode>
 </verify>
 </testcase>