changeset 7981:aa8717a5c9cd

8001242: Improve RMI HTTP conformance Reviewed-by: ahgross, mchung, smarks
author dmocek
date Mon, 19 Nov 2012 15:38:56 -0800
parents 1b616e1ca09c
children ecedf46ae7db
files src/share/classes/sun/rmi/transport/proxy/CGIHandler.java src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
diffstat 2 files changed, 17 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java	Mon Nov 19 13:54:12 2012 -0800
+++ b/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java	Mon Nov 19 15:38:56 2012 -0800
@@ -293,11 +293,14 @@
                     "unexpected EOF reading server response");
 
             if (line.toLowerCase().startsWith(key)) {
-                // if contentLengthFound is true
-                // we should probably do something here
-                responseContentLength =
-                    Integer.parseInt(line.substring(key.length()).trim());
-                contentLengthFound = true;
+                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'));
--- a/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java	Mon Nov 19 13:54:12 2012 -0800
+++ b/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java	Mon Nov 19 15:38:56 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * 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,11 +70,14 @@
                 throw new EOFException();
 
             if (line.toLowerCase().startsWith(key)) {
-                // if contentLengthFound is true
-                // we should probably do something here
-                bytesLeft =
-                    Integer.parseInt(line.substring(key.length()).trim());
-                contentLengthFound = true;
+                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.