Backed out updated libcurl.

extensions/curl/curl-src/tests/data/test1008

@@ -11,9 +11,6 @@ HTTP proxy NTLM auth
 
 # Server-side
 <reply>
-<servercmd>
-connection-monitor
-</servercmd>
 
 # this is returned first since we get no proxy-auth
 <data1001>
@@ -89,18 +86,9 @@ NTLM
  <name>
 HTTP proxy CONNECT auth NTLM with chunked-encoded 407 response
  </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.example.com:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
+http://test.remote.server.com:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
 </command>
-<precheck>
-chkhostname curlhost
-</precheck>
 </client>
 
 # Verify data after the test has been "shot"
@@ -108,23 +96,27 @@ chkhostname curlhost
 <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/
+</strippart>
 <protocol>
-CONNECT test.remote.example.com:1008 HTTP/1.1
-Host: test.remote.example.com:1008
+CONNECT test.remote.server.com:1008 HTTP/1.0
+Host: test.remote.server.com:1008
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.example.com:1008 HTTP/1.1
-Host: test.remote.example.com:1008
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
+CONNECT test.remote.server.com:1008 HTTP/1.0
+Host: test.remote.server.com:1008
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 Proxy-Connection: Keep-Alive
 
 GET /path/10080002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.example.com:1008
+Host: test.remote.server.com:1008
 Accept: */*
 
-[DISCONNECT]
 </protocol>
 </verify>
 </testcase>