8001242: Improve RMI HTTP conformance

Reviewed-by: ahgross, mchung, smarks

src/share/classes/sun/rmi/transport/proxy/CGIHandler.java

@@ -293,12 +293,15 @@ final class CGIForwardCommand implements CGICommandHandler {
                     "unexpected EOF reading server response");
 
             if (line.toLowerCase().startsWith(key)) {
-                // if contentLengthFound is true
-                // we should probably do something here
+                if (contentLengthFound) {
+                    throw new CGIServerException(
+                            "Multiple Content-length entries found.");
+                } else {
                     responseContentLength =
                         Integer.parseInt(line.substring(key.length()).trim());
                     contentLengthFound = true;
                 }
+            }
         } while ((line.length() != 0) &&
                  (line.charAt(0) != '\r') && (line.charAt(0) != '\n'));
 

src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java

 /*
- * Copyright (c) 1996, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,12 +70,15 @@ class HttpInputStream extends FilterInputStream {
                 throw new EOFException();
 
             if (line.toLowerCase().startsWith(key)) {
-                // if contentLengthFound is true
-                // we should probably do something here
+                if (contentLengthFound) {
+                    throw new IOException(
+                            "Multiple Content-length entries found.");
+                } else {
                     bytesLeft =
                         Integer.parseInt(line.substring(key.length()).trim());
                     contentLengthFound = true;
                 }
+            }
 
             // The idea here is to go past the first blank line.
             // Some DataInputStream.readLine() documentation specifies that