cvs: php-src(PHP_5_2) / NEWS /main/streams userspace.c

scottmac Tue May 15 13:04:44 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/main/streams userspace.c Log: MFH: Fixed bug #41390 (Clarify error message with invalid protocol scheme) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.705&r2=1.2027.2.547.2.706&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.705 php-src/NEWS:1.2027.2.547.2.706 --- php-src/NEWS:1.2027.2.547.2.705 Tue May 15 12:39:05 2007 +++ php-src/NEWS Tue May 15 13:04:43 2007 @@ -10,6 +10,8 @@ - Fixed altering $this via argument named "this". (Dmitry) - Fixed PHP CLI to use the php.ini from the binary location. (Hannes) - Fixed segfault in strripos(). (Tony, Joxean Koret) +- Fixed bug #41390 (Clarify error message with invalid protocol scheme). + (Scott) - Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in "Status:" header). (anight at eyelinkmedia dot com, Dmitry) - Fixed bug #41374 (wholetext concats values of wrong nodes). (Rob) http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.31.2.3.2.4&r2=1.31.2.3.2.5&diff_format=u Index: php-src/main/streams/userspace.c diff -u php-src/main/streams/userspace.c:1.31.2.3.2.4 php-src/main/streams/userspace.c:1.31.2.3.2.5 --- php-src/main/streams/userspace.c:1.31.2.3.2.4 Tue Feb 13 19:50:59 2007 +++ php-src/main/streams/userspace.c Tue May 15 13:04:43 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: userspace.c,v 1.31.2.3.2.4 2007/02/13 19:50:59 tony2001 Exp $ */ +/* $Id: userspace.c,v 1.31.2.3.2.5 2007/05/15 13:04:43 scottmac Exp $ */ #include "php.h" #include "php_globals.h" @@ -458,8 +458,8 @@ if (zend_hash_exists(php_stream_get_url_stream_wrappers_hash(), protocol, protocol_len + 1)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Protocol %s:// is already defined.", protocol); } else { - /* Should never happen */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to register wrapper class %s to %s://", classname, protocol); + /* Hash doesn't exist so it must have been an invalid protocol scheme */ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid protocol scheme specified. Unable to register wrapper class %s to %s://", classname, protocol); } } } else {