From 44aac6f5a398296ee7a3bdb306fdd30d4c0a1517 Mon Sep 17 00:00:00 2001 From: Emmanuel Lacour Date: Mon, 3 Aug 2009 15:32:57 +0200 Subject: [PATCH] Switch from application/x-httpd-php to application/x-httpd-suphp to allow simultaneous use of mod_suphp and mod_php --- debian/NEWS | 10 ++++++++++ debian/conf/suphp.conf | 4 ++-- debian/patches/01_debian.dpatch | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/NEWS b/debian/NEWS index ef13145..3150965 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,13 @@ +suphp (0.7.1-1) unstable; urgency=low + + To allow mod_suphp to work at the same time as mod_php, handler name was + renamed from application/x-httpd-php to application/x-httpd-suphp in both + suphp and apache configuration files. + You must check that any other suphp statements in your apache configuration + files uses the same syntax. + + -- Emmanuel Lacour Mon, 03 Aug 2009 15:31:37 +0200 + suphp (0.6.2-2) unstable; urgency=low To match the same behaviour as mod_php, AddHandler was replaced by AddType diff --git a/debian/conf/suphp.conf b/debian/conf/suphp.conf index edc5a27..dee1850 100644 --- a/debian/conf/suphp.conf +++ b/debian/conf/suphp.conf @@ -1,6 +1,6 @@ - AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml - suPHP_AddHandler application/x-httpd-php + AddType application/x-httpd-suphp .php .php3 .php4 .php5 .phtml + suPHP_AddHandler application/x-httpd-suphp suPHP_Engine on diff --git a/debian/patches/01_debian.dpatch b/debian/patches/01_debian.dpatch index 0b072d4..d3af120 100644 --- a/debian/patches/01_debian.dpatch +++ b/debian/patches/01_debian.dpatch @@ -27,7 +27,7 @@ [handlers] ;Handler for php-scripts -x-httpd-php="php:/usr/bin/php" -+application/x-httpd-php="php:/usr/bin/php-cgi" ++application/x-httpd-suphp="php:/usr/bin/php-cgi" ;Handler for CGI-scripts x-suphp-cgi="execute:!self" -- 2.11.0