From d522db0c330868d78019b17bea6c7d62694b7b04 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 6 Feb 2020 17:33:58 +0300
Subject: Release version 7.67.0+5

Fix tests to fail for HTTP errors
---
 libcurl/manifest               |  2 +-
 libcurl/tests/basic/driver.c   | 17 ++++++++++++++++-
 libcurl/tests/basic/testscript | 10 +++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'libcurl')

diff --git a/libcurl/manifest b/libcurl/manifest
index beb576c..b80d0d8 100644
--- a/libcurl/manifest
+++ b/libcurl/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libcurl
-version: 7.67.0+4
+version: 7.67.0+5
 project: curl
 summary: C library for transferring data with URLs
 license: cURL ; MIT/X derivate license.
diff --git a/libcurl/tests/basic/driver.c b/libcurl/tests/basic/driver.c
index 8e78ba9..4df9471 100644
--- a/libcurl/tests/basic/driver.c
+++ b/libcurl/tests/basic/driver.c
@@ -31,7 +31,22 @@ main (int argc, char* argv[])
     CURLcode cr = curl_easy_perform (curl);
 
     if (cr == CURLE_OK)
-      r = 0;
+    {
+      long status;
+      cr = curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &status);
+
+      if (cr == CURLE_OK)
+      {
+        if (status < 400)
+          r = 0;
+        else
+          fprintf (stderr, "HTTP error: status code %ld\n", status);
+      }
+      else
+        fprintf (stderr,
+                 "failed to get HTTP status code: %s\n",
+                 curl_easy_strerror (cr));
+    }
     else
       fprintf (stderr,
                "failed to request '%s': %s\n",
diff --git a/libcurl/tests/basic/testscript b/libcurl/tests/basic/testscript
index a2260f4..90baed2 100644
--- a/libcurl/tests/basic/testscript
+++ b/libcurl/tests/basic/testscript
@@ -5,9 +5,8 @@
 : http
 :
 $* 'http://www.example.com' >>~%EOO%
-%<!doctype .*>%
-%.+
-EOO
+  %.+
+  EOO
 
 : https
 :
@@ -18,8 +17,9 @@ EOO
 if ($c.target.class == 'windows' || \
     $c.target.class == 'macos' && $c.id == 'clang-apple')
 {
-  $* 'http://www.example.com' | set s;
-  $* 'https://www.example.com' >"$s"
+  $* 'https://www.example.com' >>~%EOO%
+    %.+
+    EOO
 }
 else
 {
-- 
cgit v1.1