Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7148758: Resolve merge issue which caused testcase failure
authorasaha
Fri, 24 Feb 2012 17:31:59 -0800
changeset 11916 d64a0627d990
parent 11902 a94ba35d9c4a
child 11917 7d32afc7a94e
7148758: Resolve merge issue which caused testcase failure Reviewed-by: alanb, chegar
jdk/src/share/classes/sun/net/httpserver/ServerConfig.java file | annotate | diff | comparison | revisions 
--- a/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java	Mon Feb 20 11:31:53 2012 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java	Fri Feb 24 17:31:59 2012 -0800
@@ -81,6 +81,10 @@
                     drainAmount = Long.getLong("sun.net.httpserver.drainAmount",
                             DEFAULT_DRAIN_AMOUNT);
 
+                    maxReqHeaders = Integer.getInteger(
+                            "sun.net.httpserver.maxReqHeaders",
+                            DEFAULT_MAX_REQ_HEADERS);
+
                     maxReqTime = Long.getLong("sun.net.httpserver.maxReqTime",
                             DEFAULT_MAX_REQ_TIME);
jdk-sandbox