1 files changed, 129 insertions, 137 deletions

diff --git a/main/streams/streams.c b/main/streams/streams.c
index 6716dce524..0889bd57a7 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -65,19 +65,20 @@ PHPAPI HashTable *php_stream_get_url_stream_wrappers_hash_global(void)
 	return &url_stream_wrappers_hash;
 }
 
-static int _php_stream_release_context(zend_rsrc_list_entry *le, void *pContext TSRMLS_DC)
+static int _php_stream_release_context(zval *zv, void *pContext TSRMLS_DC)
 {
+	zend_resource *le = Z_RES_P(zv);
 	if (le->ptr == pContext) {
-		return --le->refcount == 0;
+		return --GC_REFCOUNT(le) == 0;
 	}
 	return 0;
 }
 
-static int forget_persistent_resource_id_numbers(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+static int forget_persistent_resource_id_numbers(zend_resource *rsrc TSRMLS_DC)
 {
 	php_stream *stream;
 
-	if (Z_TYPE_P(rsrc) != le_pstream) {
+	if (rsrc->type != le_pstream) {
 		return 0;
 	}
 
@@ -87,11 +88,11 @@ static int forget_persistent_resource_id_numbers(zend_rsrc_list_entry *rsrc TSRM
 fprintf(stderr, "forget_persistent: %s:%p\n", stream->ops->label, stream);
 #endif
 
-	stream->rsrc_id = FAILURE;
+	stream->res = NULL;
 
 	if (stream->context) {
 		zend_hash_apply_with_argument(&EG(regular_list),
-				(apply_func_arg_t) _php_stream_release_context,
+				_php_stream_release_context,
 				stream->context TSRMLS_CC);
 		stream->context = NULL;
 	}
@@ -116,36 +117,32 @@ PHPAPI php_stream *php_stream_encloses(php_stream *enclosing, php_stream *enclos
 
 PHPAPI int php_stream_from_persistent_id(const char *persistent_id, php_stream **stream TSRMLS_DC)
 {
-	zend_rsrc_list_entry *le;
+	zend_resource *le;
 
-	if (zend_hash_find(&EG(persistent_list), (char*)persistent_id, strlen(persistent_id)+1, (void*) &le) == SUCCESS) {
-		if (Z_TYPE_P(le) == le_pstream) {
+	if ((le = zend_hash_str_find_ptr(&EG(persistent_list), persistent_id, strlen(persistent_id))) != NULL) {
+		if (le->type == le_pstream) {
 			if (stream) {
 				HashPosition pos;
-				zend_rsrc_list_entry *regentry;
-				ulong index = -1; /* intentional */
+				zend_resource *regentry;
 
 				/* see if this persistent resource already has been loaded to the
 				 * regular list; allowing the same resource in several entries in the
 				 * regular list causes trouble (see bug #54623) */
 				zend_hash_internal_pointer_reset_ex(&EG(regular_list), &pos);
-				while (zend_hash_get_current_data_ex(&EG(regular_list),
-						(void **)&regentry, &pos) == SUCCESS) {
+				while ((regentry = zend_hash_get_current_data_ptr_ex(&EG(regular_list), &pos)) != NULL) {
 					if (regentry->ptr == le->ptr) {
-						zend_hash_get_current_key_ex(&EG(regular_list), NULL, NULL,
-							&index, 0, &pos);
 						break;
 					}
 					zend_hash_move_forward_ex(&EG(regular_list), &pos);
 				}
 				
 				*stream = (php_stream*)le->ptr;
-				if (index == -1) { /* not found in regular list */
-					le->refcount++;
-					(*stream)->rsrc_id = ZEND_REGISTER_RESOURCE(NULL, *stream, le_pstream);
+				if (!regentry) { /* not found in regular list */
+					GC_REFCOUNT(le)++;
+					(*stream)->res = ZEND_REGISTER_RESOURCE(NULL, *stream, le_pstream);
 				} else {
-					regentry->refcount++;
-					(*stream)->rsrc_id = index;
+					GC_REFCOUNT(regentry)++;
+					(*stream)->res = regentry;
 				}
 			}
 			return PHP_STREAM_PERSISTENT_SUCCESS;
@@ -159,13 +156,10 @@ PHPAPI int php_stream_from_persistent_id(const char *persistent_id, php_stream *
 
 static zend_llist *php_get_wrapper_errors_list(php_stream_wrapper *wrapper TSRMLS_DC)
 {
-    zend_llist *list = NULL;
     if (!FG(wrapper_errors)) {
         return NULL;
     } else {
-        zend_hash_find(FG(wrapper_errors), (const char*)&wrapper,
-            sizeof wrapper, (void**)&list);
-        return list;
+        return (zend_llist*) zend_hash_str_find_ptr(FG(wrapper_errors), (const char*)&wrapper, sizeof(wrapper));
     }
 }
 
@@ -237,7 +231,7 @@ void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char *
 void php_stream_tidy_wrapper_error_log(php_stream_wrapper *wrapper TSRMLS_DC)
 {
 	if (wrapper && FG(wrapper_errors)) {
-		zend_hash_del(FG(wrapper_errors), (const char*)&wrapper, sizeof wrapper);
+		zend_hash_str_del(FG(wrapper_errors), (const char*)&wrapper, sizeof(wrapper));
 	}
 }
 
@@ -246,6 +240,12 @@ static void wrapper_error_dtor(void *error)
 	efree(*(char**)error);
 }
 
+static void wrapper_list_dtor(zval *item) {
+	zend_llist *list = (zend_llist*)Z_PTR_P(item);
+	zend_llist_destroy(list);
+	efree(list);
+}
+
 PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int options TSRMLS_DC, const char *fmt, ...)
 {
 	va_list args;
@@ -262,18 +262,16 @@ PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int option
 		zend_llist *list = NULL;
 		if (!FG(wrapper_errors)) {
 			ALLOC_HASHTABLE(FG(wrapper_errors));
-			zend_hash_init(FG(wrapper_errors), 8, NULL,
-					(dtor_func_t)zend_llist_destroy, 0);
+			zend_hash_init(FG(wrapper_errors), 8, NULL, wrapper_list_dtor, 0);
 		} else {
-			zend_hash_find(FG(wrapper_errors), (const char*)&wrapper,
-				sizeof wrapper, (void**)&list);
+			list = zend_hash_str_find_ptr(FG(wrapper_errors), (const char*)&wrapper, sizeof(wrapper));
 		}
 
 		if (!list) {
 			zend_llist new_list;
-			zend_llist_init(&new_list, sizeof buffer, wrapper_error_dtor, 0);
-			zend_hash_update(FG(wrapper_errors), (const char*)&wrapper,
-				sizeof wrapper, &new_list, sizeof new_list, (void**)&list);
+			zend_llist_init(&new_list, sizeof(buffer), wrapper_error_dtor, 0);
+			list = zend_hash_str_update_mem(FG(wrapper_errors), (const char*)&wrapper, 
+					sizeof(wrapper), &new_list, sizeof(new_list));
 		}
 
 		/* append to linked list */
@@ -315,27 +313,23 @@ fprintf(stderr, "stream_alloc: %s:%p persistent=%s\n", ops->label, ret, persiste
 	}
 
 	if (persistent_id) {
-		zend_rsrc_list_entry le;
+		zval tmp;
 
-		Z_TYPE(le) = le_pstream;
-		le.ptr = ret;
-		le.refcount = 0;
-
-		if (FAILURE == zend_hash_update(&EG(persistent_list), (char *)persistent_id,
-					strlen(persistent_id) + 1,
-					(void *)&le, sizeof(le), NULL)) {
+		ZVAL_NEW_PERSISTENT_RES(&tmp, -1, ret, le_pstream);
 
+		if (NULL == zend_hash_str_update(&EG(persistent_list), persistent_id,
+					strlen(persistent_id), &tmp)) {
 			pefree(ret, 1);
 			return NULL;
 		}
 	}
 
-	ret->rsrc_id = ZEND_REGISTER_RESOURCE(NULL, ret, persistent_id ? le_pstream : le_stream);
+	ret->res = ZEND_REGISTER_RESOURCE(NULL, ret, persistent_id ? le_pstream : le_stream);
 	strlcpy(ret->mode, mode, sizeof(ret->mode));
 
 	ret->wrapper          = NULL;
 	ret->wrapperthis      = NULL;
-	ret->wrapperdata      = NULL;
+	ZVAL_UNDEF(&ret->wrapperdata);
 	ret->stdiocast        = NULL;
 	ret->orig_path        = NULL;
 	ret->context          = NULL;
@@ -374,8 +368,9 @@ static const char *_php_stream_pretty_free_options(int close_options, char *out)
 }
 #endif
 
-static int _php_stream_free_persistent(zend_rsrc_list_entry *le, void *pStream TSRMLS_DC)
+static int _php_stream_free_persistent(zval *zv, void *pStream TSRMLS_DC)
 {
+	zend_resource *le = Z_RES_P(zv);
 	return le->ptr == pStream;
 }
 
@@ -467,7 +462,9 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov
 		 * the resource list, otherwise the resource will point to invalid memory.
 		 * In any case, let's always completely delete it from the resource list,
 		 * not only when PHP_STREAM_FREE_RELEASE_STREAM is set */
-		while (zend_list_delete(stream->rsrc_id) == SUCCESS) {}
+//???		while (zend_list_delete(stream->res) == SUCCESS) {}
+//???		stream->res->gc.refcount = 0;
+		zend_list_close(stream->res);
 	}
 
 	if (close_options & PHP_STREAM_FREE_CALL_DTOR) {
@@ -507,9 +504,9 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov
 			stream->wrapper = NULL;
 		}
 
-		if (stream->wrapperdata) {
+		if (Z_TYPE(stream->wrapperdata) != IS_UNDEF) {
 			zval_ptr_dtor(&stream->wrapperdata);
-			stream->wrapperdata = NULL;
+			ZVAL_UNDEF(&stream->wrapperdata);
 		}
 
 		if (stream->readbuf) {
@@ -559,7 +556,7 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov
 	}
 
 	if (context) {
-		zend_list_delete(context->rsrc_id);
+		zend_list_delete(context->res);
 	}
 
 	return ret;
@@ -689,7 +686,7 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_D
 						stream->is_persistent);
 			}
 
-			justread = stream->ops->read(stream, stream->readbuf + stream->writepos,
+			justread = stream->ops->read(stream, (char*)stream->readbuf + stream->writepos,
 					stream->readbuflen - stream->writepos
 					TSRMLS_CC);
 
@@ -791,7 +788,7 @@ PHPAPI int _php_stream_putc(php_stream *stream, int c TSRMLS_DC)
 {
 	unsigned char buf = c;
 
-	if (php_stream_write(stream, &buf, 1) > 0) {
+	if (php_stream_write(stream, (char*)&buf, 1) > 0) {
 		return 1;
 	}
 	return EOF;
@@ -839,18 +836,18 @@ PHPAPI int _php_stream_stat(php_stream *stream, php_stream_statbuf *ssb TSRMLS_D
 	return (stream->ops->stat)(stream, ssb TSRMLS_CC);
 }
 
-PHPAPI const char *php_stream_locate_eol(php_stream *stream, const char *buf, size_t buf_len TSRMLS_DC)
+PHPAPI const char *php_stream_locate_eol(php_stream *stream, zend_string *buf TSRMLS_DC)
 {
 	size_t avail;
 	const char *cr, *lf, *eol = NULL;
 	const char *readptr;
 
 	if (!buf) {
-		readptr = stream->readbuf + stream->readpos;
+		readptr = (char*)stream->readbuf + stream->readpos;
 		avail = stream->writepos - stream->readpos;
 	} else {
-		readptr = buf;
-		avail = buf_len;
+		readptr = buf->val;
+		avail = buf->len;
 	}
 
 	/* Look for EOL */
@@ -918,8 +915,8 @@ PHPAPI char *_php_stream_get_line(php_stream *stream, char *buf, size_t maxlen,
 			const char *eol;
 			int done = 0;
 
-			readptr = stream->readbuf + stream->readpos;
-			eol = php_stream_locate_eol(stream, NULL, 0 TSRMLS_CC);
+			readptr = (char*)stream->readbuf + stream->readpos;
+			eol = php_stream_locate_eol(stream, NULL TSRMLS_CC);
 
 			if (eol) {
 				cpysz = eol - readptr + 1;
@@ -1022,13 +1019,13 @@ static const char *_php_stream_search_delim(php_stream *stream,
 	}
 }
 
-PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *returned_len, const char *delim, size_t delim_len TSRMLS_DC)
+PHPAPI zend_string *php_stream_get_record(php_stream *stream, size_t maxlen, const char *delim, size_t delim_len TSRMLS_DC)
 {
-	char	*ret_buf;				/* returned buffer */
+	zend_string	*ret_buf;				/* returned buffer */
 	const char *found_delim = NULL;
 	size_t	buffered_len,
 			tent_ret_len;			/* tentative returned length */
-	int		has_delim	 = delim_len > 0;
+	int	has_delim = delim_len > 0;
 
 	if (maxlen == 0) {
 		return NULL;
@@ -1097,16 +1094,16 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *re
 		}
 	}
 
-	ret_buf = emalloc(tent_ret_len + 1);
+	ret_buf = STR_ALLOC(tent_ret_len, 0);
 	/* php_stream_read will not call ops->read here because the necessary
 	 * data is guaranteedly buffered */
-	*returned_len = php_stream_read(stream, ret_buf, tent_ret_len);
+	ret_buf->len = php_stream_read(stream, ret_buf->val, tent_ret_len);
 
 	if (found_delim) {
 		stream->readpos += delim_len;
 		stream->position += delim_len;
 	}
-	ret_buf[*returned_len] = '\0';
+	ret_buf->val[ret_buf->len] = '\0';
 	return ret_buf;
 }
 
@@ -1422,7 +1419,7 @@ PHPAPI size_t _php_stream_passthru(php_stream * stream STREAMS_DC TSRMLS_DC)
 }
 
 
-PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen, int persistent STREAMS_DC TSRMLS_DC)
+PHPAPI zend_string *_php_stream_copy_to_mem(php_stream *src, size_t maxlen, int persistent STREAMS_DC TSRMLS_DC)
 {
 	size_t ret = 0;
 	char *ptr;
@@ -1430,9 +1427,10 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen
 	int step = CHUNK_SIZE;
 	int min_room = CHUNK_SIZE / 4;
 	php_stream_statbuf ssbuf;
+	zend_string *result;
 
 	if (maxlen == 0) {
-		return 0;
+		return STR_EMPTY_ALLOC();
 	}
 
 	if (maxlen == PHP_STREAM_COPY_ALL) {
@@ -1440,7 +1438,8 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen
 	}
 
 	if (maxlen > 0) {
-		ptr = *buf = pemalloc_rel_orig(maxlen + 1, persistent);
+		result = STR_ALLOC(maxlen, persistent);
+		ptr = result->val;
 		while ((len < maxlen) && !php_stream_eof(src)) {
 			ret = php_stream_read(src, ptr, maxlen - len);
 			if (!ret) {
@@ -1451,11 +1450,12 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen
 		}
 		if (len) {
 			*ptr = '\0';
+			result->len = len;
 		} else {
-			pefree(*buf, persistent);
-			*buf = NULL;
+			STR_FREE(result);
+			result = NULL;
 		}
-		return len;
+		return result;
 	}
 
 	/* avoid many reallocs by allocating a good sized chunk to begin with, if
@@ -1470,26 +1470,28 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen
 		max_len = step;
 	}
 
-	ptr = *buf = pemalloc_rel_orig(max_len, persistent);
+	result = STR_ALLOC(max_len, persistent);
+	ptr = result->val;
 
-	while((ret = php_stream_read(src, ptr, max_len - len)))	{
+	while ((ret = php_stream_read(src, ptr, max_len - len)))	{
 		len += ret;
 		if (len + min_room >= max_len) {
-			*buf = perealloc_rel_orig(*buf, max_len + step, persistent);
+			result = STR_REALLOC(result, max_len + step, persistent);
 			max_len += step;
-			ptr = *buf + len;
+			ptr = result->val + len;
 		} else {
 			ptr += ret;
 		}
 	}
 	if (len) {
-		*buf = perealloc_rel_orig(*buf, len + 1, persistent);
-		(*buf)[len] = '\0';
+		result = STR_REALLOC(result, len, persistent);
+		result->val[len] = '\0';
 	} else {
-		pefree(*buf, persistent);
-		*buf = NULL;
+		STR_FREE(result);
+		result = NULL;
 	}
-	return len;
+
+	return result;
 }
 
 /* Returns SUCCESS/FAILURE and sets *len to the number of bytes moved */
@@ -1613,14 +1615,14 @@ PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size
 
 /* {{{ wrapper init and registration */
 
-static void stream_resource_regular_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+static void stream_resource_regular_dtor(zend_resource *rsrc TSRMLS_DC)
 {
 	php_stream *stream = (php_stream*)rsrc->ptr;
 	/* set the return value for pclose */
 	FG(pclose_ret) = php_stream_free(stream, PHP_STREAM_FREE_CLOSE | PHP_STREAM_FREE_RSRC_DTOR);
 }
 
-static void stream_resource_persistent_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+static void stream_resource_persistent_dtor(zend_resource *rsrc TSRMLS_DC)
 {
 	php_stream *stream = (php_stream*)rsrc->ptr;
 	FG(pclose_ret) = php_stream_free(stream, PHP_STREAM_FREE_CLOSE | PHP_STREAM_FREE_RSRC_DTOR);
@@ -1655,14 +1657,11 @@ int php_init_stream_wrappers(int module_number TSRMLS_DC)
 	/* Filters are cleaned up by the streams they're attached to */
 	le_stream_filter = zend_register_list_destructors_ex(NULL, NULL, "stream filter", module_number);
 
-	return (
-			zend_hash_init(&url_stream_wrappers_hash, 0, NULL, NULL, 1) == SUCCESS
-			&&
-			zend_hash_init(php_get_stream_filters_hash_global(), 0, NULL, NULL, 1) == SUCCESS
-			&&
-			zend_hash_init(php_stream_xport_get_hash(), 0, NULL, NULL, 1) == SUCCESS
-			&&
-			php_stream_xport_register("tcp", php_stream_generic_socket_factory TSRMLS_CC) == SUCCESS
+	zend_hash_init(&url_stream_wrappers_hash, 8, NULL, NULL, 1);
+	zend_hash_init(php_get_stream_filters_hash_global(), 8, NULL, NULL, 1);
+	zend_hash_init(php_stream_xport_get_hash(), 8, NULL, NULL, 1);
+
+	return (php_stream_xport_register("tcp", php_stream_generic_socket_factory TSRMLS_CC) == SUCCESS
 			&&
 			php_stream_xport_register("udp", php_stream_generic_socket_factory TSRMLS_CC) == SUCCESS
 #if defined(AF_UNIX) && !(defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE))
@@ -1710,21 +1709,19 @@ PHPAPI int php_register_url_stream_wrapper(const char *protocol, php_stream_wrap
 		return FAILURE;
 	}
 
-	return zend_hash_add(&url_stream_wrappers_hash, protocol, protocol_len + 1, &wrapper, sizeof(wrapper), NULL);
+	return zend_hash_str_add_ptr(&url_stream_wrappers_hash, protocol, protocol_len, wrapper) ? SUCCESS : FAILURE;
 }
 
 PHPAPI int php_unregister_url_stream_wrapper(const char *protocol TSRMLS_DC)
 {
-	return zend_hash_del(&url_stream_wrappers_hash, protocol, strlen(protocol) + 1);
+	return zend_hash_str_del(&url_stream_wrappers_hash, protocol, strlen(protocol));
 }
 
 static void clone_wrapper_hash(TSRMLS_D)
 {
-	php_stream_wrapper *tmp;
-
 	ALLOC_HASHTABLE(FG(stream_wrappers));
 	zend_hash_init(FG(stream_wrappers), zend_hash_num_elements(&url_stream_wrappers_hash), NULL, NULL, 1);
-	zend_hash_copy(FG(stream_wrappers), &url_stream_wrappers_hash, NULL, &tmp, sizeof(tmp));
+	zend_hash_copy(FG(stream_wrappers), &url_stream_wrappers_hash, NULL);
 }
 
 /* API for registering VOLATILE wrappers */
@@ -1740,7 +1737,7 @@ PHPAPI int php_register_url_stream_wrapper_volatile(const char *protocol, php_st
 		clone_wrapper_hash(TSRMLS_C);
 	}
 
-	return zend_hash_add(FG(stream_wrappers), protocol, protocol_len + 1, &wrapper, sizeof(wrapper), NULL);
+	return zend_hash_str_add_ptr(FG(stream_wrappers), protocol, protocol_len, wrapper) ? SUCCESS : FAILURE;
 }
 
 PHPAPI int php_unregister_url_stream_wrapper_volatile(const char *protocol TSRMLS_DC)
@@ -1749,7 +1746,7 @@ PHPAPI int php_unregister_url_stream_wrapper_volatile(const char *protocol TSRML
 		clone_wrapper_hash(TSRMLS_C);
 	}
 
-	return zend_hash_del(FG(stream_wrappers), protocol, strlen(protocol) + 1);
+	return zend_hash_str_del(FG(stream_wrappers), protocol, strlen(protocol));
 }
 /* }}} */
 
@@ -1757,7 +1754,7 @@ PHPAPI int php_unregister_url_stream_wrapper_volatile(const char *protocol TSRML
 PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, const char **path_for_open, int options TSRMLS_DC)
 {
 	HashTable *wrapper_hash = (FG(stream_wrappers) ? FG(stream_wrappers) : &url_stream_wrappers_hash);
-	php_stream_wrapper **wrapperpp = NULL;
+	php_stream_wrapper *wrapper = NULL;
 	const char *p, *protocol = NULL;
 	int n = 0;
 
@@ -1784,9 +1781,9 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, const
 
 	if (protocol) {
 		char *tmp = estrndup(protocol, n);
-		if (FAILURE == zend_hash_find(wrapper_hash, (char*)tmp, n + 1, (void**)&wrapperpp)) {
+		if (NULL == (wrapper = zend_hash_str_find_ptr(wrapper_hash, (char*)tmp, n))) {
 			php_strtolower(tmp, n);
-			if (FAILURE == zend_hash_find(wrapper_hash, (char*)tmp, n + 1, (void**)&wrapperpp)) {
+			if (NULL == (wrapper = zend_hash_str_find_ptr(wrapper_hash, (char*)tmp, n))) {
 				char wrapper_name[32];
 
 				if (n >= sizeof(wrapper_name)) {
@@ -1796,7 +1793,7 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, const
 
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find the wrapper \"%s\" - did you forget to enable it when you configured PHP?", wrapper_name);
 
-				wrapperpp = NULL;
+				wrapper = NULL;
 				protocol = NULL;
 			}
 		}
@@ -1846,14 +1843,14 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, const
 		if (FG(stream_wrappers)) {
 		/* The file:// wrapper may have been disabled/overridden */
 
-			if (wrapperpp) {
+			if (wrapper) {
 				/* It was found so go ahead and provide it */
-				return *wrapperpp;
+				return wrapper;
 			}
 
 			/* Check again, the original check might have not known the protocol name */
-			if (zend_hash_find(wrapper_hash, "file", sizeof("file"), (void**)&wrapperpp) == SUCCESS) {
-				return *wrapperpp;
+			if ((wrapper = zend_hash_str_find_ptr(wrapper_hash, "file", sizeof("file")-1)) != NULL) {
+				return wrapper;
 			}
 
 			if (options & REPORT_ERRORS) {
@@ -1865,7 +1862,7 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, const
 		return plain_files_wrapper;
 	}
 
-	if (wrapperpp && (*wrapperpp)->is_url &&
+	if (wrapper && wrapper->is_url &&
         (options & STREAM_DISABLE_URL_PROTECTION) == 0 &&
 	    (!PG(allow_url_fopen) ||
 	     (((options & STREAM_OPEN_FOR_INCLUDE) ||
@@ -1883,7 +1880,7 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, const
 		return NULL;
 	}
 
-	return *wrapperpp;
+	return wrapper;
 }
 /* }}} */
 
@@ -2168,10 +2165,10 @@ PHPAPI php_stream_context *php_stream_context_set(php_stream *stream, php_stream
 	stream->context = context;
 
 	if (context) {
-		zend_list_addref(context->rsrc_id);
+		GC_REFCOUNT(context->res)++;
 	}
 	if (oldcontext) {
-		zend_list_delete(oldcontext->rsrc_id);
+		zend_list_delete(oldcontext->res);
 	}
 
 	return oldcontext;
@@ -2186,9 +2183,9 @@ PHPAPI void php_stream_notification_notify(php_stream_context *context, int noti
 
 PHPAPI void php_stream_context_free(php_stream_context *context)
 {
-	if (context->options) {
+	if (Z_TYPE(context->options) != IS_UNDEF) {
 		zval_ptr_dtor(&context->options);
-		context->options = NULL;
+		ZVAL_UNDEF(&context->options);
 	}
 	if (context->notifier) {
 		php_stream_notification_free(context->notifier);
@@ -2203,10 +2200,9 @@ PHPAPI php_stream_context *php_stream_context_alloc(TSRMLS_D)
 
 	context = ecalloc(1, sizeof(php_stream_context));
 	context->notifier = NULL;
-	MAKE_STD_ZVAL(context->options);
-	array_init(context->options);
+	array_init(&context->options);
 
-	context->rsrc_id = ZEND_REGISTER_RESOURCE(NULL, context, php_le_stream_context(TSRMLS_C));
+	context->res = ZEND_REGISTER_RESOURCE(NULL, context, php_le_stream_context(TSRMLS_C));
 	return context;
 }
 
@@ -2223,65 +2219,61 @@ PHPAPI void php_stream_notification_free(php_stream_notifier *notifier)
 	efree(notifier);
 }
 
-PHPAPI int php_stream_context_get_option(php_stream_context *context,
-		const char *wrappername, const char *optionname, zval ***optionvalue)
+PHPAPI zval *php_stream_context_get_option(php_stream_context *context,
+		const char *wrappername, const char *optionname)
 {
-	zval **wrapperhash;
+	zval *wrapperhash;
 
-	if (FAILURE == zend_hash_find(Z_ARRVAL_P(context->options), (char*)wrappername, strlen(wrappername)+1, (void**)&wrapperhash)) {
-		return FAILURE;
+	if (NULL == (wrapperhash = zend_hash_str_find(Z_ARRVAL(context->options), wrappername, strlen(wrappername)))) {
+		return NULL;
 	}
-	return zend_hash_find(Z_ARRVAL_PP(wrapperhash), (char*)optionname, strlen(optionname)+1, (void**)optionvalue);
+	return zend_hash_str_find(Z_ARRVAL_P(wrapperhash), optionname, strlen(optionname));
 }
 
 PHPAPI int php_stream_context_set_option(php_stream_context *context,
 		const char *wrappername, const char *optionname, zval *optionvalue)
 {
-	zval **wrapperhash;
-	zval *category, *copied_val;
+	zval *wrapperhash;
+	zval category, copied_val;
 
-	ALLOC_INIT_ZVAL(copied_val);
-	*copied_val = *optionvalue;
-	zval_copy_ctor(copied_val);
-	INIT_PZVAL(copied_val);
+	ZVAL_DUP(&copied_val, optionvalue);
 
-	if (FAILURE == zend_hash_find(Z_ARRVAL_P(context->options), (char*)wrappername, strlen(wrappername)+1, (void**)&wrapperhash)) {
-		MAKE_STD_ZVAL(category);
-		array_init(category);
-		if (FAILURE == zend_hash_update(Z_ARRVAL_P(context->options), (char*)wrappername, strlen(wrappername)+1, (void**)&category, sizeof(zval *), NULL)) {
+	if (NULL == (wrapperhash = zend_hash_str_find(Z_ARRVAL(context->options), wrappername, strlen(wrappername)))) {
+		array_init(&category);
+		if (NULL == zend_hash_str_update(Z_ARRVAL(context->options), (char*)wrappername, strlen(wrappername), &category)) {
 			return FAILURE;
 		}
 
 		wrapperhash = &category;
 	}
-	return zend_hash_update(Z_ARRVAL_PP(wrapperhash), (char*)optionname, strlen(optionname)+1, (void**)&copied_val, sizeof(zval *), NULL);
+	return zend_hash_str_update(Z_ARRVAL_P(wrapperhash), optionname, strlen(optionname), &copied_val) ? SUCCESS : FAILURE;
 }
 /* }}} */
 
 /* {{{ php_stream_dirent_alphasort
  */
-PHPAPI int php_stream_dirent_alphasort(const char **a, const char **b)
+PHPAPI int php_stream_dirent_alphasort(const zend_string **a, const zend_string **b)
 {
-	return strcoll(*a, *b);
+	return strcoll((*a)->val, (*b)->val);
 }
 /* }}} */
 
 /* {{{ php_stream_dirent_alphasortr
  */
-PHPAPI int php_stream_dirent_alphasortr(const char **a, const char **b)
+PHPAPI int php_stream_dirent_alphasortr(const zend_string **a, const zend_string **b)
 {
-	return strcoll(*b, *a);
+	return strcoll((*b)->val, (*a)->val);
 }
 /* }}} */
 
 /* {{{ php_stream_scandir
  */
-PHPAPI int _php_stream_scandir(const char *dirname, char **namelist[], int flags, php_stream_context *context,
-			  int (*compare) (const char **a, const char **b) TSRMLS_DC)
+PHPAPI int _php_stream_scandir(const char *dirname, zend_string **namelist[], int flags, php_stream_context *context,
+			  int (*compare) (const zend_string **a, const zend_string **b) TSRMLS_DC)
 {
 	php_stream *stream;
 	php_stream_dirent sdp;
-	char **vector = NULL;
+	zend_string **vector = NULL;
 	unsigned int vector_size = 0;
 	unsigned int nfiles = 0;
 
@@ -2307,10 +2299,10 @@ PHPAPI int _php_stream_scandir(const char *dirname, char **namelist[], int flags
 				}
 				vector_size *= 2;
 			}
-			vector = (char **) safe_erealloc(vector, vector_size, sizeof(char *), 0);
+			vector = (zend_string **) safe_erealloc(vector, vector_size, sizeof(char *), 0);
 		}
 
-		vector[nfiles] = estrdup(sdp.d_name);
+		vector[nfiles] = STR_INIT(sdp.d_name, strlen(sdp.d_name), 0);
 
 		nfiles++;
 		if(vector_size < 10 || nfiles == 0) {
@@ -2325,7 +2317,7 @@ PHPAPI int _php_stream_scandir(const char *dirname, char **namelist[], int flags
 	*namelist = vector;
 
 	if (nfiles > 0 && compare) {
-		qsort(*namelist, nfiles, sizeof(char *), (int(*)(const void *, const void *))compare);
+		qsort(*namelist, nfiles, sizeof(zend_string *), (int(*)(const void *, const void *))compare);
 	}
 	return nfiles;
 }