iliaa Tue May 24 23:06:07 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mime_magic mime_magic.c
Log:
MFH: Return error on an invalid input to mime_content_type() function.
http://cvs.php.net/diff.php/php-src/ext/mime_magic/mime_magic.c?r1=1.37.2.1&r2=1.37.2.2&ty=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.37.2.1
php-src/ext/mime_magic/mime_magic.c:1.37.2.2
--- php-src/ext/mime_magic/mime_magic.c:1.37.2.1 Thu Dec 16 07:35:42 2004
+++ php-src/ext/mime_magic/mime_magic.c Tue May 24 23:06:07 2005
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.37.2.1 2004/12/16 12:35:42 sniper Exp $
+ $Id: mime_magic.c,v 1.37.2.2 2005/05/25 03:06:07 iliaa Exp $
This module contains a lot of stuff taken from Apache mod_mime_magic,
so the license section is a little bit longer than usual:
@@ -345,6 +345,7 @@
/* fallthru if not a stream resource */
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "can only process
string or stream arguments");
+ RETURN_FALSE;
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php