cvs: /php4 php.h /php4/ext/apache apache.c

andrei Tue Dec 21 14:40:58 1999 EDT Modified files: /php4 php.h /php4/ext/apache apache.c Log: Correct PHP's mime type. Index: php4/php.h diff -u php4/php.h:1.51 php4/php.h:1.52 --- php4/php.h:1.51 Fri Dec 17 14:16:34 1999 +++ php4/php.h Tue Dec 21 14:40:26 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.51 1999/12/17 19:16:34 zeev Exp $ */ +/* $Id: php.h,v 1.52 1999/12/21 19:40:26 andrei Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -246,7 +246,7 @@ #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 Index: php4/ext/apache/apache.c diff -u php4/ext/apache/apache.c:1.24 php4/ext/apache/apache.c:1.25 --- php4/ext/apache/apache.c:1.24 Sat Dec 18 17:34:54 1999 +++ php4/ext/apache/apache.c Tue Dec 21 14:40:27 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache.c,v 1.24 1999/12/18 22:34:54 zeev Exp $ */ +/* $Id: apache.c,v 1.25 1999/12/21 19:40:27 andrei Exp $ */ #include "php.h" #include "ext/standard/head.h" #include "php_globals.h" @@ -297,7 +297,7 @@ /* 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>&lt;?include \"%s\"&gt;</code> instead)", (*filename)->value.str.val); if (rr) destroy_sub_req (rr);