Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 82a43e8

Browse files
committed
Issue 32 and Issue 34
1 parent 73bf291 commit 82a43e8

File tree

1 file changed

+173
-1
lines changed

1 file changed

+173
-1
lines changed

docker/etc/webdefault.xml

Lines changed: 173 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
id="jsp"
256256
>
257257
<servlet-name>jsp</servlet-name>
258-
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
258+
<servlet-class>org.eclipse.jetty.jsp.JettyJspServlet</servlet-class>
259259
<init-param>
260260
<param-name>development</param-name>
261261
<param-value>false</param-value>
@@ -288,6 +288,9 @@
288288
</servlet-mapping>
289289
<!-- ===========================END JSP================================== -->
290290

291+
<!-- ==================================================================== -->
292+
<!-- Disable TRACE method with security constraint -->
293+
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
291294
<security-constraint>
292295
<web-resource-collection>
293296
<web-resource-name>Disable TRACE</web-resource-name>
@@ -296,6 +299,13 @@
296299
</web-resource-collection>
297300
<auth-constraint/>
298301
</security-constraint>
302+
<security-constraint>
303+
<web-resource-collection>
304+
<web-resource-name>Enable everything but TRACE</web-resource-name>
305+
<url-pattern>/</url-pattern>
306+
<http-method-omission>TRACE</http-method-omission>
307+
</web-resource-collection>
308+
</security-constraint>
299309

300310
<security-constraint>
301311
<web-resource-collection>
@@ -311,6 +321,168 @@
311321
<welcome-file>index.jsp</welcome-file>
312322
</welcome-file-list>
313323

324+
<!-- ==================================================================== -->
325+
<!-- Default locale encodings -->
326+
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
327+
<locale-encoding-mapping-list>
328+
<locale-encoding-mapping>
329+
<locale>ar</locale>
330+
<encoding>ISO-8859-6</encoding>
331+
</locale-encoding-mapping>
332+
<locale-encoding-mapping>
333+
<locale>be</locale>
334+
<encoding>ISO-8859-5</encoding>
335+
</locale-encoding-mapping>
336+
<locale-encoding-mapping>
337+
<locale>bg</locale>
338+
<encoding>ISO-8859-5</encoding>
339+
</locale-encoding-mapping>
340+
<locale-encoding-mapping>
341+
<locale>ca</locale>
342+
<encoding>ISO-8859-1</encoding>
343+
</locale-encoding-mapping>
344+
<locale-encoding-mapping>
345+
<locale>cs</locale>
346+
<encoding>ISO-8859-2</encoding>
347+
</locale-encoding-mapping>
348+
<locale-encoding-mapping>
349+
<locale>da</locale>
350+
<encoding>ISO-8859-1</encoding>
351+
</locale-encoding-mapping>
352+
<locale-encoding-mapping>
353+
<locale>de</locale>
354+
<encoding>ISO-8859-1</encoding>
355+
</locale-encoding-mapping>
356+
<locale-encoding-mapping>
357+
<locale>el</locale>
358+
<encoding>ISO-8859-7</encoding>
359+
</locale-encoding-mapping>
360+
<locale-encoding-mapping>
361+
<locale>en</locale>
362+
<encoding>ISO-8859-1</encoding>
363+
</locale-encoding-mapping>
364+
<locale-encoding-mapping>
365+
<locale>es</locale>
366+
<encoding>ISO-8859-1</encoding>
367+
</locale-encoding-mapping>
368+
<locale-encoding-mapping>
369+
<locale>et</locale>
370+
<encoding>ISO-8859-1</encoding>
371+
</locale-encoding-mapping>
372+
<locale-encoding-mapping>
373+
<locale>fi</locale>
374+
<encoding>ISO-8859-1</encoding>
375+
</locale-encoding-mapping>
376+
<locale-encoding-mapping>
377+
<locale>fr</locale>
378+
<encoding>ISO-8859-1</encoding>
379+
</locale-encoding-mapping>
380+
<locale-encoding-mapping>
381+
<locale>hr</locale>
382+
<encoding>ISO-8859-2</encoding>
383+
</locale-encoding-mapping>
384+
<locale-encoding-mapping>
385+
<locale>hu</locale>
386+
<encoding>ISO-8859-2</encoding>
387+
</locale-encoding-mapping>
388+
<locale-encoding-mapping>
389+
<locale>is</locale>
390+
<encoding>ISO-8859-1</encoding>
391+
</locale-encoding-mapping>
392+
<locale-encoding-mapping>
393+
<locale>it</locale>
394+
<encoding>ISO-8859-1</encoding>
395+
</locale-encoding-mapping>
396+
<locale-encoding-mapping>
397+
<locale>iw</locale>
398+
<encoding>ISO-8859-8</encoding>
399+
</locale-encoding-mapping>
400+
<locale-encoding-mapping>
401+
<locale>ja</locale>
402+
<encoding>Shift_JIS</encoding>
403+
</locale-encoding-mapping>
404+
<locale-encoding-mapping>
405+
<locale>ko</locale>
406+
<encoding>EUC-KR</encoding>
407+
</locale-encoding-mapping>
408+
<locale-encoding-mapping>
409+
<locale>lt</locale>
410+
<encoding>ISO-8859-2</encoding>
411+
</locale-encoding-mapping>
412+
<locale-encoding-mapping>
413+
<locale>lv</locale>
414+
<encoding>ISO-8859-2</encoding>
415+
</locale-encoding-mapping>
416+
<locale-encoding-mapping>
417+
<locale>mk</locale>
418+
<encoding>ISO-8859-5</encoding>
419+
</locale-encoding-mapping>
420+
<locale-encoding-mapping>
421+
<locale>nl</locale>
422+
<encoding>ISO-8859-1</encoding>
423+
</locale-encoding-mapping>
424+
<locale-encoding-mapping>
425+
<locale>no</locale>
426+
<encoding>ISO-8859-1</encoding>
427+
</locale-encoding-mapping>
428+
<locale-encoding-mapping>
429+
<locale>pl</locale>
430+
<encoding>ISO-8859-2</encoding>
431+
</locale-encoding-mapping>
432+
<locale-encoding-mapping>
433+
<locale>pt</locale>
434+
<encoding>ISO-8859-1</encoding>
435+
</locale-encoding-mapping>
436+
<locale-encoding-mapping>
437+
<locale>ro</locale>
438+
<encoding>ISO-8859-2</encoding>
439+
</locale-encoding-mapping>
440+
<locale-encoding-mapping>
441+
<locale>ru</locale>
442+
<encoding>ISO-8859-5</encoding>
443+
</locale-encoding-mapping>
444+
<locale-encoding-mapping>
445+
<locale>sh</locale>
446+
<encoding>ISO-8859-5</encoding>
447+
</locale-encoding-mapping>
448+
<locale-encoding-mapping>
449+
<locale>sk</locale>
450+
<encoding>ISO-8859-2</encoding>
451+
</locale-encoding-mapping>
452+
<locale-encoding-mapping>
453+
<locale>sl</locale>
454+
<encoding>ISO-8859-2</encoding>
455+
</locale-encoding-mapping>
456+
<locale-encoding-mapping>
457+
<locale>sq</locale>
458+
<encoding>ISO-8859-2</encoding>
459+
</locale-encoding-mapping>
460+
<locale-encoding-mapping>
461+
<locale>sr</locale>
462+
<encoding>ISO-8859-5</encoding>
463+
</locale-encoding-mapping>
464+
<locale-encoding-mapping>
465+
<locale>sv</locale>
466+
<encoding>ISO-8859-1</encoding>
467+
</locale-encoding-mapping>
468+
<locale-encoding-mapping>
469+
<locale>tr</locale>
470+
<encoding>ISO-8859-9</encoding>
471+
</locale-encoding-mapping>
472+
<locale-encoding-mapping>
473+
<locale>uk</locale>
474+
<encoding>ISO-8859-5</encoding>
475+
</locale-encoding-mapping>
476+
<locale-encoding-mapping>
477+
<locale>zh</locale>
478+
<encoding>GB2312</encoding>
479+
</locale-encoding-mapping>
480+
<locale-encoding-mapping>
481+
<locale>zh_TW</locale>
482+
<encoding>Big5</encoding>
483+
</locale-encoding-mapping>
484+
</locale-encoding-mapping-list>
485+
314486
<session-config>
315487
<session-timeout>1440</session-timeout>
316488
</session-config>

0 commit comments

Comments
 (0)