tony2001 Fri Jan 19 14:50:11 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard streamsfuncs.c user_filters.c
Log:
MFH: fix #40168
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.12&r2=1.58.2.6.2.13&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.12
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.13
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.12 Mon Jan 1 09:36:09 2007
+++ php-src/ext/standard/streamsfuncs.c Fri Jan 19 14:50:11 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.12 2007/01/01 09:36:09 sebastian Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.13 2007/01/19 14:50:11 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -530,7 +530,7 @@
while (zend_hash_get_current_key_ex(stream_xport_hash,
&stream_xport, &stream_xport_len,
&num_key, 0, NULL) ==
HASH_KEY_IS_STRING) {
- add_next_index_stringl(return_value, stream_xport,
stream_xport_len, 1);
+ add_next_index_stringl(return_value, stream_xport,
stream_xport_len - 1, 1);
zend_hash_move_forward(stream_xport_hash);
}
} else {
@@ -558,7 +558,7 @@
(key_flags =
zend_hash_get_current_key_ex(url_stream_wrappers_hash, &stream_protocol,
&stream_protocol_len, &num_key, 0, NULL)) != HASH_KEY_NON_EXISTANT;
zend_hash_move_forward(url_stream_wrappers_hash)) {
if (key_flags == HASH_KEY_IS_STRING) {
- add_next_index_stringl(return_value,
stream_protocol, stream_protocol_len, 1);
+ add_next_index_stringl(return_value,
stream_protocol, stream_protocol_len - 1, 1);
}
}
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.4.2.4&r2=1.31.2.4.2.5&diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.31.2.4.2.4
php-src/ext/standard/user_filters.c:1.31.2.4.2.5
--- php-src/ext/standard/user_filters.c:1.31.2.4.2.4 Mon Jan 15 17:07:08 2007
+++ php-src/ext/standard/user_filters.c Fri Jan 19 14:50:11 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: user_filters.c,v 1.31.2.4.2.4 2007/01/15 17:07:08 tony2001 Exp $ */
+/* $Id: user_filters.c,v 1.31.2.4.2.5 2007/01/19 14:50:11 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -527,8 +527,9 @@
for(zend_hash_internal_pointer_reset(filters_hash);
(key_flags = zend_hash_get_current_key_ex(filters_hash,
&filter_name, &filter_name_len, &num_key, 0, NULL)) != HASH_KEY_NON_EXISTANT;
zend_hash_move_forward(filters_hash))
- if (key_flags == HASH_KEY_IS_STRING)
- add_next_index_stringl(return_value,
filter_name, filter_name_len, 1);
+ if (key_flags == HASH_KEY_IS_STRING) {
+ add_next_index_stringl(return_value,
filter_name, filter_name_len - 1, 1);
+ }
}
/* It's okay to return an empty array if no filters are registered */
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
