Commit:    61747bd041513f4e7c04fdc4890fbd1a6e76b907
Author:    Anatoliy Belsky <a...@php.net>         Mon, 2 Apr 2012 17:19:09 +0200
Committer: Stanislav Malyshev <s...@php.net>      Wed, 11 Apr 2012 20:23:45 
-0700
Parents:   dcdd6dab56c58c5798ee36269724e29c6bb562b8
Branches:  PHP-5.4.1

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=61747bd041513f4e7c04fdc4890fbd1a6e76b907

Log:
Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails

Bugs:
https://bugs.php.net/61565

Changed paths:
  M  ext/fileinfo/fileinfo.c


Diff:
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 29f9beb..757ba04 100644
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -510,11 +510,22 @@ static void 
_php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
                        wrap = php_stream_locate_url_wrapper(buffer, &tmp2, 0 
TSRMLS_CC);
 
                        if (wrap) {
+                               php_stream *stream;
                                php_stream_context *context = 
php_stream_context_from_zval(zcontext, 0);
+
+#ifdef PHP_WIN32
+                               if (php_stream_stat_path_ex(buffer, 0, &ssb, 
context) == SUCCESS) {
+                                       if (ssb.sb.st_mode & S_IFDIR) {
+                                               ret_val = mime_directory;
+                                               goto common;
+                                       }
+                               }
+#endif
+
 #if PHP_API_VERSION < 20100412
-                               php_stream *stream = 
php_stream_open_wrapper_ex(buffer, "rb", ENFORCE_SAFE_MODE | REPORT_ERRORS, 
NULL, context);
+                               stream = php_stream_open_wrapper_ex(buffer, 
"rb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
 #else
-                               php_stream *stream = 
php_stream_open_wrapper_ex(buffer, "rb", REPORT_ERRORS, NULL, context);
+                               stream = php_stream_open_wrapper_ex(buffer, 
"rb", REPORT_ERRORS, NULL, context);
 #endif
 
                                if (!stream) {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to