tony2001 Mon Dec 18 14:56:20 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard php_fopen_wrapper.c
/php-src NEWS
Log:
MFH: fix #39850 (SplFileObject throws contradictory/wrong error messages when
trying to open "php://wrong")
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45.2.4.2.4&r2=1.45.2.4.2.5&diff_format=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.4
php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.5
--- php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.4 Sun Nov 5
20:08:58 2006
+++ php-src/ext/standard/php_fopen_wrapper.c Mon Dec 18 14:56:20 2006
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.4 2006/11/05 20:08:58 rasmus Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.5 2006/12/18 14:56:20 tony2001 Exp $
*/
#include <stdio.h>
#include <stdlib.h>
@@ -276,6 +276,7 @@
return stream;
} else {
/* invalid php://thingy */
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid php:// URL
specified");
return NULL;
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.436&r2=1.2027.2.547.2.437&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.436 php-src/NEWS:1.2027.2.547.2.437
--- php-src/NEWS:1.2027.2.547.2.436 Mon Dec 18 14:39:22 2006
+++ php-src/NEWS Mon Dec 18 14:56:20 2006
@@ -6,6 +6,8 @@
. cookies
. canary protection (debug build only)
. random generation of cookies and canaries
+- Fixed bug #39850 (SplFileObject throws contradictory/wrong error messages
+ when trying to open "php://wrong"). (Tony)
- Fixed bug #39832 (SOAP Server: parameter not matching the WSDL specified type
are set to 0). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php