From 855887af7928d70a2938b7c9c750a0c237c47c15 Mon Sep 17 00:00:00 2001
From: Peter Simonyi <pts@petersimonyi.ca>
Date: Wed, 10 Jul 2019 18:42:35 -0400
Subject: http: allow overriding timecond with custom header

With CURLOPT_TIMECONDITION set, a header is automatically added (e.g.
If-Modified-Since).  Allow this to be replaced or suppressed with
CURLOPT_HTTPHEADER.

Fixes #4103
Closes #4109
---
 tests/data/Makefile.inc |  2 +-
 tests/data/test1593     | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tests/data/test1593

(limited to 'tests/data')

diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index f28f24c8b..a8f85af54 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -177,7 +177,7 @@ test1540 test1541 \
 test1550 test1551 test1552 test1553 test1554 test1555 test1556 test1557 \
 test1558 test1559 test1560 test1561 test1562 \
 \
-test1590 test1591 test1592 \
+test1590 test1591 test1592 test1593 \
 \
 test1600 test1601 test1602 test1603 test1604 test1605 test1606 test1607 \
 test1608 test1609 test1620 test1621 \
diff --git a/tests/data/test1593 b/tests/data/test1593
new file mode 100644
index 000000000..405aa84e5
--- /dev/null
+++ b/tests/data/test1593
@@ -0,0 +1,49 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP replaced headers
+CURLOPT_TIMECONDITION
+If-Modified-Since
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data nocheck="yes">
+HTTP/1.1 304 Not Modified
+Date: Thu, 11 Jul 2019 02:26:59 GMT
+Server: test-server/swsclose
+
+</data>
+</reply>
+# Client-side
+<client>
+<server>
+http
+</server>
+<name>
+HTTP custom header overrides CURLOPT_TIMECONDITION
+</name>
+<tool>
+lib1593
+</tool>
+<command>
+http://%HOSTIP:%HTTPPORT/1593
+</command>
+</client>
+
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+# Note here the lack of If-Modified-Since
+<protocol>
+GET /1593 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol>
+</verify>
+</testcase>
-- 
cgit v1.2.3