# HG changeset patch
# User lana
# Date 1330133904 28800
# Node ID 7d32afc7a94e76dd347d51cab7c2afaf1f26cb63
# Parent  33f703959597c90c9ba4a760a67e6ba385318b06# Parent  d64a0627d990ab8994c9a589e94db6ecf054ce1c
Merge

diff -r 33f703959597 -r 7d32afc7a94e jdk/src/share/classes/sun/net/httpserver/ServerConfig.java
--- a/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java	Thu Feb 23 07:54:49 2012 -0800
+++ b/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java	Fri Feb 24 17:38:24 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);