Fix normalization

Author: kocsismate

ext/uri/tests/057.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Test normalization after using RFC 3986 withers
+--EXTENSIONS--
+uri
+--FILE--
+<?php
+
+$uri = \Uri\Rfc3986\Uri::parse('https://example.com/path-%65xample/');
+var_dump($uri->getPath());
+var_dump($uri->getRawPath());
+
+$newUri = $uri->withPath('/updated-path');
+var_dump($newUri->getPath());
+var_dump($newUri->getRawPath());
+
+?>
+--EXPECT--
+string(14) "/path-example/"
+string(16) "/path-%65xample/"
+string(13) "/updated-path"
+string(13) "/updated-path"

ext/uri/uri_parser_rfc3986.c

@@ -106,6 +106,14 @@ ZEND_ATTRIBUTE_NONNULL static UriUriA *get_uri_for_writing(uri_internal_t *inter
 	return &uriparser_uris->uri;
 }
 
+ZEND_ATTRIBUTE_NONNULL static void reset_normalized_uri_after_writing(uri_internal_t *internal_uri)
+{
+	php_uri_parser_rfc3986_uris *uriparser_uris = internal_uri->uri;
+
+	uriFreeUriMembersMmA(&uriparser_uris->normalized_uri, mm);
+	uriparser_uris->normalized_uri_initialized = false;
+}
+
 ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_scheme_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
 {
 	const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
@@ -135,6 +143,8 @@ static zend_result php_uri_parser_rfc3986_scheme_write(struct uri_internal_t *in
 		return FAILURE;
 	}
 
+	reset_normalized_uri_after_writing(internal_uri);
+
 	return SUCCESS;
 }
 
@@ -167,10 +177,11 @@ zend_result php_uri_parser_rfc3986_userinfo_write(struct uri_internal_t *interna
 		return FAILURE;
 	}
 
+	reset_normalized_uri_after_writing(internal_uri);
+
 	return SUCCESS;
 }
 
-
 ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_username_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
 {
 	const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
@@ -252,6 +263,8 @@ static zend_result php_uri_parser_rfc3986_host_write(struct uri_internal_t *inte
 		return FAILURE;
 	}
 
+	reset_normalized_uri_after_writing(internal_uri);
+
 	return SUCCESS;
 }
 
@@ -296,6 +309,8 @@ static zend_result php_uri_parser_rfc3986_port_write(struct uri_internal_t *inte
 		return FAILURE;
 	}
 
+	reset_normalized_uri_after_writing(internal_uri);
+
 	return SUCCESS;
 }
 
@@ -343,6 +358,8 @@ static zend_result php_uri_parser_rfc3986_path_write(struct uri_internal_t *inte
 		return FAILURE;
 	}
 
+	reset_normalized_uri_after_writing(internal_uri);
+
 	return SUCCESS;
 }
 
@@ -375,6 +392,8 @@ static zend_result php_uri_parser_rfc3986_query_write(struct uri_internal_t *int
 		return FAILURE;
 	}
 
+	reset_normalized_uri_after_writing(internal_uri);
+
 	return SUCCESS;
 }
 
@@ -407,6 +426,8 @@ static zend_result php_uri_parser_rfc3986_fragment_write(struct uri_internal_t *
 		return FAILURE;
 	}
 
+	reset_normalized_uri_after_writing(internal_uri);
+
 	return SUCCESS;
 }