From 828ffa35841a585ddeeac9d934e3a4951e1702c0 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Mon, 28 Dec 2020 09:53:39 +0000
Subject: [PATCH] Von DefaultServlet auf HttpServlet umgestellt
---
src/de/uhilger/wbx/web/AdocServlet.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/de/uhilger/wbx/web/AdocServlet.java b/src/de/uhilger/wbx/web/AdocServlet.java
index f89b21f..a80ba5c 100644
--- a/src/de/uhilger/wbx/web/AdocServlet.java
+++ b/src/de/uhilger/wbx/web/AdocServlet.java
@@ -22,6 +22,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.util.HashMap;
@@ -30,11 +31,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
+import javax.servlet.ServletOutputStream;
import static org.asciidoctor.Asciidoctor.Factory.create;
import org.asciidoctor.Asciidoctor;
import static org.asciidoctor.AttributesBuilder.attributes;
import static org.asciidoctor.OptionsBuilder.options;
+import org.asciidoctor.SafeMode;
@@ -89,6 +92,7 @@
wenn die Quelle sich geandert hat oder
die PDF-Datei noch nicht existiert
*/
+
String pdf = request.getParameter(PDF);
if(null != pdf && pdf.equalsIgnoreCase(Boolean.TRUE.toString())) {
File pdffile = new File(adocfile.getParentFile(), fname + DOT + PDF);
@@ -97,16 +101,17 @@
response.setContentType("application/pdf");
transform(absname, PDF);
}
- }
-
- try (PrintWriter out = response.getWriter()) {
- // abhaengig vom Parameter pdf HTML- oder PDF-Datei ausgeben
- FileInputStream in = new FileInputStream(outfile);
- BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"));
- String line;
- while ((line = reader.readLine()) != null) {
- out.println(line);
+ ServletOutputStream os = response.getOutputStream();
+ InputStream bytes = new FileInputStream(outfile);
+ int b = bytes.read();
+ while(b > -1 ) {
+ os.write(b);
+ b = bytes.read();
}
+ } else {
+ PrintWriter out = response.getWriter();
+ InputStreamReader in = new InputStreamReader(new FileInputStream(outfile), "UTF-8");
+ in.transferTo(out);
}
}
@@ -146,10 +151,12 @@
Map<String, Object> options;
if(null != backend) {
options = options().inPlace(false)
+ .safe(SafeMode.SERVER)
.backend(backend).attributes(attributes).asMap();
} else {
options = options().inPlace(false)
+ .safe(SafeMode.SERVER)
.attributes(attributes).asMap();
}
--
Gitblit v1.9.3