From f7f63595b3aeb2e8a3a31b148bb5c4ce598a5e2c Mon Sep 17 00:00:00 2001 From: Xavier Date: Wed, 25 Sep 2019 19:43:46 +0200 Subject: [PATCH] Fix Apache regexp (#1943) --- _example/etc/portal-apache2.4.conf | 2 +- _example/etc/portal-apache2.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_example/etc/portal-apache2.4.conf b/_example/etc/portal-apache2.4.conf index e6a38d84f..050fed0e2 100644 --- a/_example/etc/portal-apache2.4.conf +++ b/_example/etc/portal-apache2.4.conf @@ -31,7 +31,7 @@ # result (example: /oauth2/checksession.html) as static file. Then # uncomment the following line. # RewriteCond "%{REQUEST_FILENAME}" "!\.html$" - RewriteCond "%{REQUEST_FILENAME}" "!^/(?:(?:static|javascript|favicon).*|.*\.fcgi)$" + RewriteCond "%{REQUEST_URI}" "!^/(?:(?:static|javascript|favicon).*|.*\.fcgi(?:/.*)?)$" RewriteRule "^/(.+)$" "/index.fcgi/$1" [PT] # Note that Content-Security-Policy header is generated by portal itself diff --git a/_example/etc/portal-apache2.conf b/_example/etc/portal-apache2.conf index cba224270..4852b7dd7 100644 --- a/_example/etc/portal-apache2.conf +++ b/_example/etc/portal-apache2.conf @@ -27,7 +27,7 @@ # result (example: /oauth2/checksession.html) as static file. Then # uncomment the following line. # RewriteCond "%{REQUEST_FILENAME}" "!\.html$" - RewriteCond "%{REQUEST_FILENAME}" "!^/(?:(?:static|javascript|favicon).*|.*\.fcgi)$" + RewriteCond "%{REQUEST_URI}" "!^/(?:(?:static|javascript|favicon).*|.*\.fcgi(?:/.*)?)$" RewriteRule "^/(.+)$" "/index.fcgi/$1" [PT] # Note that Content-Security-Policy header is generated by portal itself