From 38bb2ceca5ab79645cdb9179062c37242a9842c2 Mon Sep 17 00:00:00 2001
From: asaha <unknown>
Date: Fri, 24 Feb 2012 17:31:59 -0800
Subject: [PATCH] 7148758: Resolve merge issue which caused testcase failure
 Reviewed-by: alanb, chegar

---
 src/share/classes/sun/net/httpserver/ServerConfig.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/share/classes/sun/net/httpserver/ServerConfig.java b/src/share/classes/sun/net/httpserver/ServerConfig.java
index 5e898c75a..a6b742782 100644
--- a/src/share/classes/sun/net/httpserver/ServerConfig.java
+++ b/src/share/classes/sun/net/httpserver/ServerConfig.java
@@ -81,6 +81,10 @@ class ServerConfig {
                     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);
 
-- 
GitLab