From 8b2872f7d0c61c7b64dd795635204d0c02d7924a Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Mon, 27 Feb 2017 12:40:42 +0100 Subject: [PATCH] Bug 18175: Use Makefile variable for api path. * etc/koha-httpd.conf: Use __API_CGI_DIR__ instead of %{DOCUMENT_ROOT}/../api. Test plan: Confirming the problem: - Do a standard install of Koha - Test any REST API route. - The route will error out. Confirming the resolution: - Apply this patch. - Do a standard install of Koha - Test any REST API route. - The route will work. Confirming no regression: - Apply this patch. - Do a dev install of Koha - Test any REST API route. - The route will work. --- etc/koha-httpd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf index 2747791b50..471ea3a6c5 100644 --- a/etc/koha-httpd.conf +++ b/etc/koha-httpd.conf @@ -123,7 +123,7 @@ RewriteBase /api/ RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{DOCUMENT_ROOT}/../api/$1/app.pl -f + RewriteCond __API_CGI_DIR__/$1/app.pl -f RewriteRule ^(.*?)/.* $1/app.pl/api/$0 [L] -- 2.11.1