cvs: php-src /main/streams userspace.c
| From: | Hannes Magnusson | Date: | Tue, 31 Mar 2009 16:25:58 +0000 |
| Subject: | cvs: php-src /main/streams userspace.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56835@lists.php.net to get a copy of this message | ||
bjori Tue Mar 31 16:25:58 2009 UTC
Modified files:
/php-src/main/streams userspace.c
Log:
Fix errormessage check
# Is correct in 5.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.54&r2=1.55&diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.54 php-src/main/streams/userspace.c:1.55
--- php-src/main/streams/userspace.c:1.54 Wed Mar 25 19:55:50 2009
+++ php-src/main/streams/userspace.c Tue Mar 31 16:25:58 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: userspace.c,v 1.54 2009/03/25 19:55:50 bjori Exp $ */
+/* $Id: userspace.c,v 1.55 2009/03/31 16:25:58 bjori Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -515,7 +515,7 @@
RETURN_TRUE;
} else {
/* We failed. But why? */
- if (zend_hash_exists(php_stream_get_url_stream_wrappers_hash(), protocol, protocol_len)) {
+ 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 {
/* Hash doesn't exist so it must have been an invalid protocol scheme */