changeset 5066:ca2218135bac

7148758: Resolve merge issue which caused testcase failure Reviewed-by: alanb, chegar
author asaha
date Fri, 24 Feb 2012 17:31:59 -0800
parents 7699f0a9c6d7
children 39dcb3264fb3
files src/share/classes/sun/net/httpserver/ServerConfig.java
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/net/httpserver/ServerConfig.java	Mon Feb 20 11:31:53 2012 -0800
+++ b/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);