From c88042cb73290b44eb2faea498dd46c6240a1bf1 Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Thu, 11 Jan 2018 04:49:16 -0600
Subject: [PATCH] fis issue [REST] xCAT restful API xcatws cannot work #4622
 (#4623)

---
 xCAT-server/xCAT-wsapi/xcat-ws.conf.apache22 | 4 ++--
 xCAT-server/xCAT-wsapi/xcat-ws.conf.apache24 | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache22 b/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache22
index 21ce5b943..a8432e979 100644
--- a/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache22
+++ b/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache22
@@ -7,8 +7,8 @@ RewriteCond %{HTTPS} !=on
 RewriteRule ^/?xcatws/(.*) https://%{SERVER_NAME}/xcatws/$1 [R,L]
 RewriteRule ^/?xcatwsv2/(.*) https://%{SERVER_NAME}/xcatwsv2/$1 [R,L]
 
-<Files (xcatws.cgi|zvmxcatws.cgi)>
+<FilesMatch "^(xcatws.cgi|zvmxcatws.cgi)$">
     Order allow,deny
     Allow from all
-</Files>
+</FilesMatch>
 
diff --git a/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache24 b/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache24
index 7fc48853c..7c54e25bc 100644
--- a/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache24
+++ b/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache24
@@ -5,7 +5,6 @@ RewriteCond %{HTTPS} !=on
 RewriteRule ^/?xcatws/(.*) https://%{SERVER_NAME}/xcatws/$1 [R,L]
 RewriteRule ^/?xcatwsv2/(.*) https://%{SERVER_NAME}/xcatwsv2/$1 [R,L]
 
-<Files (xcatws.cgi|zvmxcatws.cgi)>
+<FilesMatch "^(xcatws.cgi|zvmxcatws.cgi)$">
 Require all granted
-</Files>
-
+</FilesMatch>