From 6a5f4c3f2366cf4ed4c8bbf04dd47e53e4d8815c Mon Sep 17 00:00:00 2001 From: Jeremy Chadwick Date: Wed, 12 Dec 2007 17:27:49 +0000 Subject: [PATCH] Fix for previous commit; user reported privately that Apache would print "Cannot get media type from 'x-httpd-php'" as a warning in the ErrorLog. Issue caused by incorrect AddType syntax. This commit fixes the pkg-message syntax described, as well as the example suphp.conf to reflect the proper type (value "application/x-httpd-php", not "x-httpd-php"). Submitted by: --- www/suphp/files/patch-doc::suphp.conf-example | 4 ++-- www/suphp/pkg-message | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/suphp/files/patch-doc::suphp.conf-example b/www/suphp/files/patch-doc::suphp.conf-example index c1c1d46dd23c..456109bc1e1f 100644 --- a/www/suphp/files/patch-doc::suphp.conf-example +++ b/www/suphp/files/patch-doc::suphp.conf-example @@ -1,5 +1,5 @@ --- doc/suphp.conf-example.orig 2005-11-26 11:29:02.000000000 -0800 -+++ doc/suphp.conf-example 2007-11-11 02:36:02.000000000 -0800 ++++ doc/suphp.conf-example 2007-12-12 09:21:02.000000000 -0800 @@ -6,7 +6,7 @@ loglevel=info @@ -24,7 +24,7 @@ [handlers] ;Handler for php-scripts -x-httpd-php=php:/usr/bin/php -+x-httpd-php=php:/usr/local/bin/php-cgi ++application/x-httpd-php=php:/usr/local/bin/php-cgi ;Handler for CGI-scripts x-suphp-cgi=execute:!self diff --git a/www/suphp/pkg-message b/www/suphp/pkg-message index 45f278a74ba7..789b6aa7db88 100644 --- a/www/suphp/pkg-message +++ b/www/suphp/pkg-message @@ -38,8 +38,8 @@ you used the following Apache directives: In suPHP 0.6.x, you should use the following: suPHP_Engine on - AddType x-httpd-php .php - suPHP_AddHandler x-httpd-php + AddType application/x-httpd-php .php + suPHP_AddHandler application/x-httpd-php Otherwise, Apache will begin serving PHP files as downloadable content, rather than parse them with the PHP interpreter.