Fix a number of HTTP issues

tests/standalone/io/http_redirect_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 //
 
 #import("dart:io");
 #import("dart:uri");
 
 HttpServer setupServer() {
   HttpServer server = new HttpServer();
@@ skipping 50 matching lines @@
   server.addRequestHandler(
      (HttpRequest request) => request.path == "/B",
      (HttpRequest request, HttpResponse response) {
        response.headers.set(HttpHeaders.LOCATION,
                             "http://127.0.0.1:${server.port}/A");
        response.statusCode = HttpStatus.MOVED_TEMPORARILY;
        response.outputStream.close();
      }
   );
 
+  // Setup redirect checking headers.
+  server.addRequestHandler(
+     (HttpRequest request) => request.path == "/src",
+     (HttpRequest request, HttpResponse response) {
+       Expect.equals("value", request.headers.value("X-Request-Header"));
+       response.headers.set(HttpHeaders.LOCATION,
+                            "http://127.0.0.1:${server.port}/target");
+       response.statusCode = HttpStatus.MOVED_PERMANENTLY;
+       response.outputStream.close();
+     }
+  );
+  server.addRequestHandler(
+     (HttpRequest request) => request.path == "/target",
+     (HttpRequest request, HttpResponse response) {
+       Expect.equals("value", request.headers.value("X-Request-Header"));
+       response.outputStream.close();
+     }
+  );
+
   return server;
 }
 
 void checkRedirects(int redirectCount, HttpClientConnection conn) {
   if (redirectCount < 2) {
     Expect.isNull(conn.redirects);
   } else {
     Expect.equals(redirectCount - 1, conn.redirects.length);
     for (int i = 0; i < redirectCount - 2; i++) {
       Expect.equals(conn.redirects[i].location.path, "/${i + 2}");
@@ skipping 19 matching lines @@
         conn.redirect();
       } else {
         Expect.equals(HttpStatus.NOT_FOUND, response.statusCode);
         server.close();
         client.shutdown();
       }
     };
   };
 }
 
+void testManualRedirectWithHeaders() {
+  HttpServer server = setupServer();
+  HttpClient client = new HttpClient();
+
+  int redirectCount = 0;
+  HttpClientConnection conn =
+     client.getUrl(new Uri.fromString("http://127.0.0.1:${server.port}/src"));
+  conn.followRedirects = false;
+  conn.onRequest = (HttpClientRequest request) {
+    request.headers.add("X-Request-Header", "value");
+    request.outputStream.close();
+  };
+  conn.onResponse = (HttpClientResponse response) {
+    response.inputStream.onData = response.inputStream.read;
+    response.inputStream.onClosed = () {
+      redirectCount++;
+      if (redirectCount < 2) {
+        Expect.isTrue(response.isRedirect);
+        conn.redirect();
+      } else {
+        Expect.equals(HttpStatus.OK, response.statusCode);
+        server.close();
+        client.shutdown();
+      }
+    };
+  };
+}
+
 void testAutoRedirect() {
   HttpServer server = setupServer();
   HttpClient client = new HttpClient();
 
   var requestCount = 0;
 
   void onRequest(HttpClientRequest request) {
     requestCount++;
     request.outputStream.close();
   }
 
   void onResponse(HttpClientResponse response) {
     response.inputStream.onData =
         () => Expect.fail("Response data not expected");
     response.inputStream.onClosed = () {
       Expect.equals(1, requestCount);
       server.close();
       client.shutdown();
     };
   };
 
   HttpClientConnection conn =
       client.getUrl(
           new Uri.fromString("http://127.0.0.1:${server.port}/redirect"));
   conn.onRequest = onRequest;
   conn.onResponse = onResponse;
   conn.onError = (e) => Expect.fail("Error not expected ($e)");
 }
 
+void testAutoRedirectWithHeaders() {
+  HttpServer server = setupServer();
+  HttpClient client = new HttpClient();
+
+  var requestCount = 0;
+
+  void onRequest(HttpClientRequest request) {
+    requestCount++;
+    request.headers.add("X-Request-Header", "value");
+    request.outputStream.close();
+  };
+
+  void onResponse(HttpClientResponse response) {
+    response.inputStream.onData =
+        () => Expect.fail("Response data not expected");
+    response.inputStream.onClosed = () {
+      Expect.equals(1, requestCount);
+      server.close();
+      client.shutdown();
+    };
+  };
+
+  HttpClientConnection conn =
+      client.getUrl(new Uri.fromString("http://127.0.0.1:${server.port}/src"));
+  conn.onRequest = onRequest;
+  conn.onResponse = onResponse;
+  conn.onError = (e) => Expect.fail("Error not expected ($e)");
+}
+
 void testAutoRedirectLimit() {
   HttpServer server = setupServer();
   HttpClient client = new HttpClient();
 
   HttpClientConnection conn =
       client.getUrl(new Uri.fromString("http://127.0.0.1:${server.port}/1"));
   conn.onResponse = (HttpClientResponse response) {
     response.inputStream.onData = () => Expect.fail("Response not expected");
     response.inputStream.onClosed = () => Expect.fail("Response not expected");
   };
@@ skipping 19 matching lines @@
   conn.onError = (e) {
     Expect.isTrue(e is RedirectLoopException);
     Expect.equals(2, e.redirects.length);
     server.close();
     client.shutdown();
   };
 }
 
 main() {
   testManualRedirect();
+  testManualRedirectWithHeaders();
   testAutoRedirect();
+  testAutoRedirectWithHeaders();
   testAutoRedirectLimit();
   testRedirectLoop();
 }