Skip to content

Commit 346e403

Browse files
committed
overlay: reset web.xml to 4.4.9 before to apply patch
1 parent d2e2328 commit 346e403

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

web/src/main/webapp/WEB-INF/web.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
<filter-name>characterEncodingFilter</filter-name>
5959
<url-pattern>/*</url-pattern>
6060
</filter-mapping>
61+
6162
<listener>
6263
<listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class>
6364
</listener>
@@ -205,12 +206,13 @@
205206
-->
206207
<init-param>
207208
<param-name>mode</param-name>
208-
<param-value>ALLOW-FROM</param-value>
209+
<param-value>SAMEORIGIN</param-value>
209210
</init-param>
210-
<init-param>
211+
<!-- Allowed url. Used in ALLOW-FROM mode only -->
212+
<!--<init-param>
211213
<param-name>url</param-name>
212-
<param-value>https://*.admin.ch https://*.cartoriviera.ch https://*.vsgis.ch http://ext.fr.ch http://mapplus.vdf.loc http://mapplus01.vdf.loc https://*.ne.ch https://*.cartolacote.ch https://*.geomapfish.dev</param-value>
213-
</init-param>
214+
<param-value>http://localhost:8888/</param-value>
215+
</init-param>-->
214216
</filter>
215217
<filter-mapping>
216218
<filter-name>XFrameOptionsFilter</filter-name>
@@ -556,7 +558,7 @@
556558

557559
<session-config>
558560
<tracking-mode>COOKIE</tracking-mode>
559-
<session-timeout>100000</session-timeout>
561+
<session-timeout>${sessionTimeout}</session-timeout>
560562
<cookie-config>
561563
<http-only>true</http-only>
562564
<secure>${cookieSecureFlag}</secure>

0 commit comments

Comments
 (0)