lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
RedKale
2016-04-07 17:50:22 +08:00
parent a3a02893ed
commit 5200953159
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/org/redkale/net/http/HttpServer.java
View File

@@ -75,34 +75,35 @@ public final class HttpServer extends Server<String, HttpContext, HttpRequest, H
if (resps != null) { if (resps != null) {
AnyValue[] addHeaders = resps.getAnyValues("addheader"); AnyValue[] addHeaders = resps.getAnyValues("addheader");
if (addHeaders.length > 0) { if (addHeaders.length > 0) {
for (int i = 0; i < addHeaders.length; i++) { for (AnyValue addHeader : addHeaders) {
String val = addHeaders[i].getValue("value"); String val = addHeader.getValue("value");
if (val == null) continue; if (val == null) continue;
if (val.startsWith("request.parameters.")) { if (val.startsWith("request.parameters.")) {
defaultAddHeaders.add(new String[]{addHeaders[i].getValue("name"), val, val.substring("request.parameters.".length()), null}); defaultAddHeaders.add(new String[]{addHeader.getValue("name"), val, val.substring("request.parameters.".length()), null});
} else if (val.startsWith("request.headers.")) { } else if (val.startsWith("request.headers.")) {
defaultAddHeaders.add(new String[]{addHeaders[i].getValue("name"), val, val.substring("request.headers.".length())}); defaultAddHeaders.add(new String[]{addHeader.getValue("name"), val, val.substring("request.headers.".length())});
} else if (val.startsWith("system.property.")) { } else if (val.startsWith("system.property.")) {
String v = System.getProperty(val.substring("system.property.".length())); String v = System.getProperty(val.substring("system.property.".length()));
if (v != null) defaultAddHeaders.add(new String[]{addHeaders[i].getValue("name"), v}); if (v != null) defaultAddHeaders.add(new String[]{addHeader.getValue("name"), v});
} else { } else {
defaultAddHeaders.add(new String[]{addHeaders[i].getValue("name"), val}); defaultAddHeaders.add(new String[]{addHeader.getValue("name"), val});
} }
} }
} }
AnyValue[] setHeaders = resps.getAnyValues("setheader"); AnyValue[] setHeaders = resps.getAnyValues("setheader");
if (setHeaders.length > 0) { if (setHeaders.length > 0) {
for (int i = 0; i < setHeaders.length; i++) { for (AnyValue setHeader : setHeaders) {
String val = setHeaders[i].getValue("value"); String val = setHeader.getValue("value");
if (val != null && val.startsWith("request.parameters.")) { if (val == null) continue;
defaultSetHeaders.add(new String[]{setHeaders[i].getValue("name"), val, val.substring("request.parameters.".length()), null}); if (val.startsWith("request.parameters.")) {
} else if (val != null && val.startsWith("request.headers.")) { defaultSetHeaders.add(new String[]{setHeader.getValue("name"), val, val.substring("request.parameters.".length()), null});
defaultSetHeaders.add(new String[]{setHeaders[i].getValue("name"), val, val.substring("request.headers.".length())}); } else if (val.startsWith("request.headers.")) {
defaultSetHeaders.add(new String[]{setHeader.getValue("name"), val, val.substring("request.headers.".length())});
} else if (val.startsWith("system.property.")) { } else if (val.startsWith("system.property.")) {
String v = System.getProperty(val.substring("system.property.".length())); String v = System.getProperty(val.substring("system.property.".length()));
if (v != null) defaultSetHeaders.add(new String[]{setHeaders[i].getValue("name"), v}); if (v != null) defaultSetHeaders.add(new String[]{setHeader.getValue("name"), v});
} else { } else {
defaultSetHeaders.add(new String[]{setHeaders[i].getValue("name"), val}); defaultSetHeaders.add(new String[]{setHeader.getValue("name"), val});
} }
} }
} }