cvs: /php3 ChangeLog /php3/functions apache.c

coar Thu Sep 9 13:41:14 1999 EDT Modified files: /php3 ChangeLog /php3/functions apache.c Log: The magic MIME type might be used as the handler name instead of/as well as the content-type, so close the hole that let such sneak by and do a virtual("foo.php3") without the error message. Index: php3/ChangeLog diff -u php3/ChangeLog:1.755 php3/ChangeLog:1.756 --- php3/ChangeLog:1.755 Wed Sep 8 08:29:39 1999 +++ php3/ChangeLog Thu Sep 9 13:41:12 1999 @@ -2,7 +2,10 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???? ??, 1999, Version 3.0.13 +- Close loophole that allowed virtual() to be used on a PHP file + without an error (Ken Coar) - Add versioning support for shared library (Sascha) +- Fix bug with '%' in error_log() strings when run as Apache module (Ken Coar) - Return false from mysql_query() and mysql_db_query() in case saving the result set data fails (Zeev) - Make --with-apache --with-xml pick up Apache-bundled expat lib @@ -24,7 +27,6 @@ - Add gd-1.6.x PNG functions (Rasmus from drew@elysium.ltd.uk) - Fix [s]printf 0-padding issues (Rasmus) - Fix a crash bug in number_format(), in case of very large numbers (Zeev) -- Fix bug with '%' in error_log() strings when run as Apache module (Ken Coar) July 28, 1999, Version 3.0.12 - gmktime/mktime DST fix (RL and Jim) Index: php3/functions/apache.c diff -u php3/functions/apache.c:1.48 php3/functions/apache.c:1.49 --- php3/functions/apache.c:1.48 Wed Jun 16 07:34:17 1999 +++ php3/functions/apache.c Thu Sep 9 13:41:13 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache.c,v 1.48 1999/06/16 11:34:17 ssb Exp $ */ +/* $Id: apache.c,v 1.49 1999/09/09 17:41:13 coar Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -181,14 +181,17 @@ RETURN_FALSE; } +#if 0 /* Cannot include another PHP file because of global conflicts */ - if (rr->content_type && - !strcmp(rr->content_type, PHP3_MIME_TYPE)) { + if ((rr->content_type && (!strcmp(rr->content_type, PHP3_MIME_TYPE))) || + (rr->handler && (!strcmp(rr->handler, PHP3_MIME_TYPE)))) { php3_error(E_WARNING, "Cannot include a PHP file " - "(use <code>&lt;?include \"%s\"&gt;</code> instead)", filename->value.str.val); + "(use <code>&lt;?include \"%s\"&gt;</code> instead)", + filename->value.str.val); if (rr) destroy_sub_req (rr); RETURN_FALSE; } +#endif if (!php3_header()) { RETURN_FALSE;