diff --git a/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java index fa7373927..97d906909 100644 --- a/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java +++ b/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java @@ -83,7 +83,7 @@ import javax.servlet.http.Part; maxFileSize = 10_000_000, maxRequestSize = 10_000_000, fileSizeThreshold = 1_000_000, - location = "/tmp/DecodeServlet") + location = "/tmp") @WebServlet("/w/decode") public final class DecodeServlet extends HttpServlet { diff --git a/zxingorg/src/main/java/com/google/zxing/web/RedirectFilter.java b/zxingorg/src/main/java/com/google/zxing/web/RedirectFilter.java index 0d6ed0b0a..487b768be 100644 --- a/zxingorg/src/main/java/com/google/zxing/web/RedirectFilter.java +++ b/zxingorg/src/main/java/com/google/zxing/web/RedirectFilter.java @@ -45,9 +45,8 @@ public final class RedirectFilter implements Filter { FilterChain filterChain) throws IOException, ServletException { HttpServletRequest request = (HttpServletRequest) servletRequest; String requestURI = request.getRequestURI(); - if ("/index.jspx".equals(requestURI) || - "/w/".equals(requestURI) || - "/w/index.jspx".equals(requestURI)) { + if ("/".equals(requestURI) || "/index.jspx".equals(requestURI) || + "/w/".equals(requestURI) || "/w/index.jspx".equals(requestURI)) { redirect(servletResponse, "/w/decode.jspx"); } else if (requestURI.startsWith(OLD_JAVADOC_PREFIX)) { String withoutPrefix = requestURI.substring(OLD_JAVADOC_PREFIX.length()); diff --git a/zxingorg/src/web/w/response.jspx b/zxingorg/src/web/w/response.jspx index 3392bd113..a5ee0fad6 100644 --- a/zxingorg/src/web/w/response.jspx +++ b/zxingorg/src/web/w/response.jspx @@ -14,19 +14,19 @@ See the License for the specific language governing permissions and limitations under the License. --> - + ]]> - <c:out value="${requestScope['title']}"/> + ${requestScope['title']}
- -

+ +

${requestScope['text']}