File: 14_fix-htaccess.diff

package info (click to toggle)
mlmmj 1.6.0-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 2,560 kB
  • sloc: ansic: 13,223; php: 1,337; perl: 904; sh: 501; makefile: 99
file content (24 lines) | stat: -rw-r--r-- 964 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
Description: The supplied .htaccess file (named dot.access in the source)
 works with Apache2 with libapache2-mod-php but does not work with Apache2 when
 used with PHP-FPM or PHP-CGI. This patch fixes that.
Author: Ron Guerin <ron@vnetworx.net>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1118971
Last-Update: 2025-11-24

--- a/contrib/web/php-admin/htdocs/dot.htaccess
+++ b/contrib/web/php-admin/htdocs/dot.htaccess
@@ -2,4 +2,3 @@
 AuthType Basic
 AuthName "mlmmj web-interface on Debian GNU/Linux"
 AuthUserFile /etc/mlmmj-php-web-admin/htpasswd
-php_value include_path "/usr/share/mlmmj-php-web-admin"
--- a/contrib/web/php-admin/htdocs/index.php
+++ b/contrib/web/php-admin/htdocs/index.php
@@ -27,6 +27,7 @@
  * IN THE SOFTWARE.
  */
 
+set_include_path(get_include_path().PATH_SEPARATOR."/usr/share/mlmmj-php-web-admin");
 require(dirname(dirname(__FILE__))."/conf/config.php");
 require(dirname(__FILE__)."/class.rFastTemplate.php");