cvs: php-src /main/streams streams.c
| From: | Greg Beaver | Date: | Mon, 28 Apr 2008 22:37:45 +0000 |
| Subject: | cvs: php-src /main/streams streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-49747@lists.php.net to get a copy of this message | ||
cellog Mon Apr 28 22:37:45 2008 UTC
Modified files:
/php-src/main/streams streams.c
Log:
MFB: 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.161&r2=1.162&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.161 php-src/main/streams/streams.c:1.162
--- php-src/main/streams/streams.c:1.161 Thu Mar 27 10:33:52 2008
+++ php-src/main/streams/streams.c Mon Apr 28 22:37:45 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.161 2008/03/27 10:33:52 dmitry Exp $ */
+/* $Id: streams.c,v 1.162 2008/04/28 22:37:45 cellog 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";