diff --git a/tests/data/test150 b/tests/data/test150 index 49ca2a66fee3aba22751e28d6141dd796d945c1f..961898d58b61a5d388b6384872e8b1f28c052c94 100644 --- a/tests/data/test150 +++ b/tests/data/test150 @@ -65,7 +65,7 @@ http://%HOSTIP:%HTTPPORT/150 -u testuser:testpass --ntlm --fail # 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! -s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA).*/$1/ +s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/ GET /150 HTTP/1.1 @@ -75,7 +75,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* GET /150 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Accept: */* diff --git a/tests/data/test155 b/tests/data/test155 index 501979eedba7f77a77fbab994866e4272a16a0bf..6b0ff5ac900811214d8cc9260c559201d34764e2 100644 --- a/tests/data/test155 +++ b/tests/data/test155 @@ -91,7 +91,7 @@ four is the number of lines # 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! -s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA).*/$1/ +s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/ PUT /155 HTTP/1.1 @@ -108,7 +108,7 @@ Content-Length: 0 Expect: 100-continue PUT /155 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Accept: */* diff --git a/tests/data/test159 b/tests/data/test159 index aa07888c24a71d1c3d964fd9d9453ccf3fbef9bf..4e335b34e077921419b4c719e8c138f346f761d6 100644 --- a/tests/data/test159 +++ b/tests/data/test159 @@ -65,7 +65,7 @@ http://%HOSTIP:%HTTPPORT/159 -u testuser:testpass --ntlm -0 # 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! -s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA).*/$1/ +s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/ GET /159 HTTP/1.0 @@ -75,7 +75,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* GET /159 HTTP/1.0 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Accept: */* diff --git a/tests/data/test169 b/tests/data/test169 index 5f6d5b428aa66af9c241b030c1987aede201e9d2..43f9bdb209cbc070760bfc54507d6e779912114f 100644 --- a/tests/data/test169 +++ b/tests/data/test169 @@ -83,7 +83,7 @@ http://data.from.server.requiring.digest.hohoho.com/169 --proxy http://%HOSTIP:% # 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! -s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAwADAHAAAAAEAA).*/$1/ +s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAwADAHAAAAA).*/$1/ GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1 @@ -95,7 +95,7 @@ Accept: */* Proxy-Connection: Keep-Alive GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1 -Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAwADAHAAAAAEAA +Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAwADAHAAAAA User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3 Host: data.from.server.requiring.digest.hohoho.com Pragma: no-cache diff --git a/tests/data/test209 b/tests/data/test209 index e42074943828a0bfc69409a55de443cc856390f4..cffb260f0ead8e95bd3b73ca8f67711bcb3b132c 100644 --- a/tests/data/test209 +++ b/tests/data/test209 @@ -81,7 +81,7 @@ http://test.remote.server.com:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT # 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! -s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAEAA).*/$1/ +s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/ CONNECT test.remote.server.com:209 HTTP/1.0 @@ -91,7 +91,7 @@ Proxy-Connection: Keep-Alive CONNECT test.remote.server.com:209 HTTP/1.0 Host: test.remote.server.com:209 -Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAEAA +Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA Proxy-Connection: Keep-Alive GET /path/2090002 HTTP/1.1 diff --git a/tests/data/test267 b/tests/data/test267 index a96799ef08670f574065892344c8195a9b3c1d76..0abf2372b92b6f5dd39c9544fcd039cc969b4b90 100644 --- a/tests/data/test267 +++ b/tests/data/test267 @@ -72,7 +72,7 @@ http://%HOSTIP:%HTTPPORT/267 -u testuser:testpass --ntlm -d "data" -H "Header1: # 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! -s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA).*/$1/ +s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/ POST /267 HTTP/1.1 @@ -86,7 +86,7 @@ Content-Length: 0 Content-Type: application/x-www-form-urlencoded POST /267 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Accept: */* diff --git a/tests/data/test67 b/tests/data/test67 index aa2500e3444c45fc26d5b1e4dff0bdb86604c08f..551b1f8dfa8b4160105cdb5a94755e93dff2c8c7 100644 --- a/tests/data/test67 +++ b/tests/data/test67 @@ -72,7 +72,7 @@ http://%HOSTIP:%HTTPPORT/67 -u testuser:testpass --ntlm # 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! -s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA).*/$1/ +s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/ GET /67 HTTP/1.1 @@ -82,7 +82,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* GET /67 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Accept: */* diff --git a/tests/data/test68 b/tests/data/test68 index b3b94faa096d3064c647a2153c17d04ecab151eb..b44fc1129daa4bdf47cfaaecf293329f3c9d9622 100644 --- a/tests/data/test68 +++ b/tests/data/test68 @@ -74,7 +74,7 @@ http://%HOSTIP:%HTTPPORT/68 -u testuser:testpass --ntlm # 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! -s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA).*/$1/ +s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/ GET /68 HTTP/1.1 @@ -84,7 +84,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* GET /68 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Accept: */* diff --git a/tests/data/test69 b/tests/data/test69 index 00e8a8c4d44d68dfb78543fec0e3998cb32c3aaa..747596e66e859bcccc6f9443e61eab5615cab5a3 100644 --- a/tests/data/test69 +++ b/tests/data/test69 @@ -87,7 +87,7 @@ http://%HOSTIP:%HTTPPORT/69 -u testuser:testpass --anyauth # 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! -s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA).*/$1/ +s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/ GET /69 HTTP/1.1 @@ -102,7 +102,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* GET /69 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Accept: */* diff --git a/tests/data/test81 b/tests/data/test81 index a07513a3e268de0d1575a1e811d5fb052bba353f..99206ae7c4add2d8f626c3042aa11b01b9c7ce47 100644 --- a/tests/data/test81 +++ b/tests/data/test81 @@ -70,7 +70,7 @@ http://%HOSTIP:%HTTPPORT/81 --proxy-user testuser:testpass -x http://%HOSTIP:%HT # 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! -s/(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA).*/$1/ +s/(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/ GET http://127.0.0.1:%HTTPPORT/81 HTTP/1.1 @@ -82,7 +82,7 @@ Accept: */* Proxy-Connection: Keep-Alive GET http://127.0.0.1:%HTTPPORT/81 HTTP/1.1 -Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Pragma: no-cache diff --git a/tests/data/test89 b/tests/data/test89 index 73e045eb3f29e358260b08334754562773a8406b..29d6db01030cb09c622b50786bdb1059e6930adf 100644 --- a/tests/data/test89 +++ b/tests/data/test89 @@ -105,7 +105,7 @@ http://%HOSTIP:%HTTPPORT/89 -u testuser:testpass --ntlm -L # 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! -s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA).*/$1/ +s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/ GET /89 HTTP/1.1 @@ -115,7 +115,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* GET /89 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Accept: */* @@ -127,7 +127,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* GET /you/890010 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS Host: 127.0.0.1:%HTTPPORT Accept: */* diff --git a/tests/data/test90 b/tests/data/test90 index 1a9782bdef73c455b8584f3e1c433be8eedddce1..eb79462f5c085df06f6b7e997bfde10db61dc24e 100644 --- a/tests/data/test90 +++ b/tests/data/test90 @@ -140,7 +140,7 @@ http://%HOSTIP:%HTTPPORT/90 -u testuser:testpass --anyauth -L # 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! -s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA).*/$1/ +s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/ GET /90 HTTP/1.1 @@ -154,7 +154,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* GET /90 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Accept: */* @@ -170,7 +170,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* GET /you/900010 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS Host: 127.0.0.1:%HTTPPORT Accept: */* diff --git a/tests/data/test91 b/tests/data/test91 index ec0ca38eca7672d3fae63ae2eaa0a98d76364415..4678f5f723ef9f78d9e80f613738965e7388f153 100644 --- a/tests/data/test91 +++ b/tests/data/test91 @@ -90,7 +90,7 @@ http://%HOSTIP:%HTTPPORT/91 --anyauth -u mydomain\\myself:secret # 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! -s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAAEAA).*/$1/ +s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAA).*/$1/ GET /91 HTTP/1.1 @@ -105,7 +105,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* GET /91 HTTP/1.1 -Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAAEAA +Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAA User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: 127.0.0.1:%HTTPPORT Accept: */*