Revert "Update to 7.44.0"

[platform/upstream/curl.git] / tests / data / test555

diff --git a/tests/data/test555 b/tests/data/test555
index a13c1e0..c802fea 100644 (file)
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -7,10 +7,12 @@
 HTTP
 HTTP POST
 POST callback
+HTTP proxy
 HTTP proxy NTLM auth
-multi interface
+multi
 </keywords>
 </info>
+
 # Server-side
 <reply>
 
@@ -79,13 +81,24 @@ lib555
 </tool>
 <features>
 NTLM
+!SSPI
+debug
 </features>
  <name>
 HTTP proxy auth NTLM with POST data from read callback multi-if
  </name>
+ <setenv>
+# we force our own host name, in order to make the test machine independent
+CURL_GETHOSTNAME=curlhost
+# we try to use the LD_PRELOAD hack, if not a debug build
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
+ </setenv>
  <command>
-http://test.remote.server.com/path/555 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.example.com/path/555 http://%HOSTIP:%HTTPPORT testuser:testpass
 </command>
+<precheck>
+chkhostname curlhost
+</precheck>
 </client>
 
 # Verify data after the test has been "shot"
@@ -93,37 +106,33 @@ http://test.remote.server.com/path/555 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 <strip>
 ^User-Agent: curl/.*
 </strip>
-# We strip off a large chunk of the type-2 NTLM message since it depends on
-# the local host name and thus differs on different machines!
 <strippart>
-s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
+# remove CR that CURLOPT_TRANSFERTEXT added, when CharConv enabled:
+s/^(this is the blurb we want to upload)\r\n/$1\n/ if($has_charconv)
 </strippart>
 <protocol>
-POST http://test.remote.server.com/path/555 HTTP/1.1\r
+POST http://test.remote.example.com/path/555 HTTP/1.1\r
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
-Host: test.remote.server.com\r
-Pragma: no-cache\r
+Host: test.remote.example.com\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 this is the blurb we want to upload
-POST http://test.remote.server.com/path/555 HTTP/1.1\r
+POST http://test.remote.example.com/path/555 HTTP/1.1\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
-Host: test.remote.server.com\r
-Pragma: no-cache\r
+Host: test.remote.example.com\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
-POST http://test.remote.server.com/path/555 HTTP/1.1\r
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
+POST http://test.remote.example.com/path/555 HTTP/1.1\r
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
-Host: test.remote.server.com\r
-Pragma: no-cache\r
+Host: test.remote.example.com\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r