diff options
| author | Andrei Zmievski <andrei@php.net> | 1999-12-21 19:40:27 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 1999-12-21 19:40:27 +0000 |
| commit | cc205c60ae1a886db40d493651b0d766f4645899 (patch) | |
| tree | 53cf4bbed0987d962b030e11299f6ac9f8e10329 | |
| parent | 99b83a38deb0101321c67fa46d0d8b2824ab5a5d (diff) | |
| download | php-git-cc205c60ae1a886db40d493651b0d766f4645899.tar.gz | |
Correct PHP's mime type.
| -rw-r--r-- | ext/apache/apache.c | 2 | ||||
| -rw-r--r-- | main/php.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/apache/apache.c b/ext/apache/apache.c index f5d9c38c5e..2cd9e9fa89 100644 --- a/ext/apache/apache.c +++ b/ext/apache/apache.c @@ -297,7 +297,7 @@ PHP_FUNCTION(virtual) /* Cannot include another PHP file because of global conflicts */ if (rr->content_type && - !strcmp(rr->content_type, PHP3_MIME_TYPE)) { + !strcmp(rr->content_type, PHP_MIME_TYPE)) { php_error(E_WARNING, "Cannot include a PHP file " "(use <code><?include \"%s\"></code> instead)", (*filename)->value.str.val); if (rr) destroy_sub_req (rr); diff --git a/main/php.h b/main/php.h index 7201592f7f..a1ec7cba1d 100644 --- a/main/php.h +++ b/main/php.h @@ -246,7 +246,7 @@ extern int ap_vsnprintf(char *, size_t, const char *, va_list); #define DONT_FREE 0 #define DO_FREE 1 -#define PHP3_MIME_TYPE "application/x-httpd-php3" +#define PHP_MIME_TYPE "application/x-httpd-php" /* macros */ #undef MIN |