From: Emmanuel Lacour Date: Wed, 17 Oct 2007 14:34:51 +0000 (+0000) Subject: Change x-httpd-php to application/x-httpd-php X-Git-Tag: 0.6.2-2~1 X-Git-Url: http://git.home-dn.net/?p=manu%2Fsuphp.git;a=commitdiff_plain;h=0feab8c956468f21f3b953550cabec16bfd7ef03 Change x-httpd-php to application/x-httpd-php --- diff --git a/debian/changelog b/debian/changelog index 8ab7527..7e1a720 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ suphp (0.6.2-2) unstable; urgency=low * remove apache 1.x package (closes: #429079) * debian/rules, debian/compat, debian/control: lintian cleanup - * debian/conf/suphp.conf: replaced AddHandler by AddType to avoid double - extensions like ".php.jpg" (closes: #416424) + * debian/conf/suphp.conf, debian/patches/01_debian.dpatch: replaced + AddHandler by AddType and x-httpd-php by application/x-httpd-php to get + the same behavior as mod php with filenames extensions (closes: #416424) -- Emmanuel Lacour Sun, 14 Oct 2007 19:42:30 +0200 diff --git a/debian/conf/suphp.conf b/debian/conf/suphp.conf index 3616074..9639f54 100644 --- a/debian/conf/suphp.conf +++ b/debian/conf/suphp.conf @@ -1,6 +1,6 @@ - AddType x-httpd-php .php .php3 .php4 .php5 .phtml - suPHP_AddHandler x-httpd-php + AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml + suPHP_AddHandler application/x-httpd-php suPHP_Engine on # # Use a specific php config file (a dir which contains a php.ini file) # suPHP_ConfigPath /etc/php4/cgi/suphp/ diff --git a/debian/patches/01_debian.dpatch b/debian/patches/01_debian.dpatch index ec7a768..d946d34 100644 --- a/debian/patches/01_debian.dpatch +++ b/debian/patches/01_debian.dpatch @@ -31,7 +31,7 @@ [handlers] ;Handler for php-scripts -x-httpd-php=php:/usr/bin/php -+x-httpd-php=php:/usr/bin/php-cgi ++application/x-httpd-php=php:/usr/bin/php-cgi ;Handler for CGI-scripts x-suphp-cgi=execute:!self