jani            Tue Jul 15 16:10:32 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/main/streams       streams.c 
  Log:
  MFH: Fixed potentially confusing error message on failure when no errors are 
logged
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.23&r2=1.82.2.6.2.24&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.23 
php-src/main/streams/streams.c:1.82.2.6.2.24
--- php-src/main/streams/streams.c:1.82.2.6.2.23        Wed Jun 11 09:02:09 2008
+++ php-src/main/streams/streams.c      Tue Jul 15 16:10:32 2008
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: streams.c,v 1.82.2.6.2.23 2008/06/11 09:02:09 dmitry Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.24 2008/07/15 16:10:32 jani Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -164,7 +164,11 @@
 
                        free_msg = 1;
                } else {
-                       msg = strerror(errno);
+                       if (wrapper == &php_plain_files_wrapper) {
+                               msg = strerror(errno);
+                       } else {
+                               msg = "operation failed";
+                       }
                }
        } else {
                msg = "no suitable wrapper could be found";



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

Reply via email to