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

Browse Source
This commit is contained in:
Redkale
2018-05-03 21:04:23 +08:00
parent e6b71a3975
commit ed7ce80565
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/redkale/net/http/HttpResponse.java
View File

@@ -134,7 +134,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
private final boolean autoOptions;
private final Supplier<String> dateSupplier;
private final Supplier<byte[]> dateSupplier;
private final HttpCookie defcookie;
@@ -151,7 +151,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
public HttpResponse(HttpContext context, HttpRequest request,
String plainContentType, String jsonContentType,
String[][] defaultAddHeaders, String[][] defaultSetHeaders,
HttpCookie defcookie, boolean autoOptions, Supplier<String> dateSupplier, List< HttpRender> renders) {
HttpCookie defcookie, boolean autoOptions, Supplier<byte[]> dateSupplier, List< HttpRender> renders) {
super(context, request);
this.plainContentType = plainContentType == null || plainContentType.isEmpty() ? "text/plain; charset=utf-8" : plainContentType;
this.jsonContentType = jsonContentType == null || jsonContentType.isEmpty() ? "application/json; charset=utf-8" : jsonContentType;
@@ -874,7 +874,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
buffer.put(("Content-Type: " + (this.contentType == null ? this.plainContentType : this.contentType) + "\r\n").getBytes());
}
buffer.put(serverNameBytes);
if (dateSupplier != null) buffer.put(("Date: " + dateSupplier.get() + "\r\n").getBytes());
if (dateSupplier != null) buffer.put(dateSupplier.get());
buffer.put(this.request.isKeepAlive() ? connectAliveBytes : connectCloseBytes);
if (this.defaultAddHeaders != null) {

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

@@ -33,7 +33,7 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
private ScheduledThreadPoolExecutor dateScheduler;
private String currDateString;
private byte[] currDateBytes;
public HttpServer() {
this(System.currentTimeMillis(), ResourceFactory.root());
@@ -396,10 +396,10 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
final String[][] addHeaders = defaultAddHeaders.isEmpty() ? null : defaultAddHeaders.toArray(new String[defaultAddHeaders.size()][]);
final String[][] setHeaders = defaultSetHeaders.isEmpty() ? null : defaultSetHeaders.toArray(new String[defaultSetHeaders.size()][]);
final boolean options = autoOptions;
Supplier<String> dateSupplier0 = null;
Supplier<byte[]> dateSupplier0 = null;
if (datePeriod == 0) {
final ZoneId gmtZone = ZoneId.of("GMT");
dateSupplier0 = () -> RFC_1123_DATE_TIME.format(java.time.ZonedDateTime.now(gmtZone));
dateSupplier0 = () -> ("Date: " + RFC_1123_DATE_TIME.format(java.time.ZonedDateTime.now(gmtZone)) + "\r\n").getBytes();
} else if (datePeriod > 0) {
if (this.dateScheduler == null) {
this.dateScheduler = new ScheduledThreadPoolExecutor(1, (Runnable r) -> {
@@ -409,17 +409,17 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
});
final DateFormat gmtDateFormat = new SimpleDateFormat("EEE, dd-MMM-yyyy HH:mm:ss z", Locale.ENGLISH);
gmtDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
currDateString = gmtDateFormat.format(new Date());
currDateBytes = ("Date: " + gmtDateFormat.format(new Date()) + "\r\n").getBytes();
this.dateScheduler.scheduleAtFixedRate(() -> {
currDateString = gmtDateFormat.format(new Date());
currDateBytes = ("Date: " + gmtDateFormat.format(new Date()) + "\r\n").getBytes();
}, 1000 - System.currentTimeMillis() % 1000, datePeriod, TimeUnit.MILLISECONDS);
dateSupplier0 = () -> currDateString;
dateSupplier0 = () -> currDateBytes;
}
}
final HttpCookie defCookie = defaultCookie;
final String addrHeader = remoteAddrHeader;
final Supplier<String> dateSupplier = dateSupplier0;
final Supplier<byte[]> dateSupplier = dateSupplier0;
AtomicLong createResponseCounter = new AtomicLong();
AtomicLong cycleResponseCounter = new AtomicLong();
ObjectPool<Response> responsePool = HttpResponse.createPool(createResponseCounter, cycleResponseCounter, this.responsePoolSize, null);
@@ -430,5 +430,4 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
plainType, jsonType, addHeaders, setHeaders, defCookie, options, dateSupplier, ((HttpPrepareServlet) prepare).renders));
return httpcontext;
}
}