Fixes

Author: kocsismate

ext/standard/http_fopen_wrapper.c

@@ -755,20 +755,20 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
 		/* decode the strings first */
 		php_url_decode(ZSTR_VAL(resource->user), ZSTR_LEN(resource->user));
 
-		smart_str_appendl(&scratch, ZSTR_VAL(resource->user), ZSTR_LEN(resource->user));
+		smart_str_append(&scratch, resource->user);
 		smart_str_appendc(&scratch, ':');
 
 		/* Note: password is optional! */
 		if (resource->password) {
 			php_url_decode(ZSTR_VAL(resource->password), ZSTR_LEN(resource->password));
-			smart_str_appendl(&scratch, ZSTR_VAL(resource->password), ZSTR_LEN(resource->password));
+			smart_str_append(&scratch, resource->password);
 		}
 
 		zend_string *scratch_str = smart_str_extract(&scratch);
 		stmp = php_base64_encode((unsigned char*)ZSTR_VAL(scratch_str), ZSTR_LEN(scratch_str));
 
 		smart_str_appends(&req_buf, "Authorization: Basic ");
-		smart_str_appendl(&req_buf, ZSTR_VAL(stmp), ZSTR_LEN(stmp));
+		smart_str_append(&req_buf, stmp);
 		smart_str_appends(&req_buf, "\r\n");
 
 		php_stream_notify_info(context, PHP_STREAM_NOTIFY_AUTH_REQUIRED, NULL, 0);

ext/standard/url.c

@@ -327,11 +327,9 @@ static void parse_url_decode_component(zval *zv, uri_component_read_mode_t read_
 		return;
 	}
 
-	if (read_mode != URI_COMPONENT_READ_NORMALIZED_ASCII && read_mode != URI_COMPONENT_READ_NORMALIZED_UNICODE) {
-		return;
+	if (read_mode == URI_COMPONENT_READ_RAW) {
+		php_url_decode(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
 	}
-
-	php_url_decode(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
 }
 
 static zend_result parse_url_read_scheme(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)

ext/uri/php_uri.c

@@ -1019,7 +1019,7 @@ PHPAPI zend_result uri_handler_register(const uri_handler_t *uri_handler)
 {
 	zend_string *key = zend_string_init_interned(uri_handler->name, strlen(uri_handler->name), true);
 
-	ZEND_ASSERT(uri_handler->name != NULL && (strlen(uri_handler->name) > 0 || strcmp(uri_handler->name, URI_PARSER_PHP) == 0));
+	ZEND_ASSERT(uri_handler->name != NULL);
 	ZEND_ASSERT(uri_handler->parse_uri != NULL);
 	ZEND_ASSERT(uri_handler->clone_uri != NULL || strcmp(uri_handler->name, URI_PARSER_PHP) == 0);
 	ZEND_ASSERT(uri_handler->uri_to_string != NULL || strcmp(uri_handler->name, URI_PARSER_PHP) == 0);