More review fixes

Author: kocsismate

ext/filter/logical_filters.c

@@ -629,10 +629,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 		}
 
 		if (
-			/* @todo Find a better solution than hardcoding the uri handler name. Skipping these checks is needed because
-			 * both uriparser and lexbor performs comprehensive validations. Also, the [] pair is removed by these
-			 * libraries in case of ipv6 URIs, therefore php_filter_is_valid_ipv6_hostname() would case false positive
-			 * failures. */
+			/* Skipping these checks is possible because the new URI implementations perform comprehensive validations. */
 			strcmp(uri_handler->name, URI_PARSER_PHP) == 0 &&
 			/* An IPv6 enclosed by square brackets is a valid hostname.*/
 			!php_filter_is_valid_ipv6_hostname(uri->host) &&
@@ -654,7 +651,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 		RETURN_VALIDATION_FAILED
 	}
 
-	if (strcmp(uri_handler->name, "parse_url") == 0 &&
+	if (strcmp(uri_handler->name, URI_PARSER_PHP) == 0 &&
 		(
 			(uri->user != NULL && !is_userinfo_valid(uri->user)) ||
 			(uri->password != NULL && !is_userinfo_valid(uri->password))

ext/openssl/xp_ssl.c

@@ -23,7 +23,7 @@
 
 #include "php.h"
 #include "ext/standard/file.h"
-#include "ext/standard/url.h"
+#include "ext/uri/php_uri.h"
 #include "streams/php_streams_int.h"
 #include "zend_smart_str.h"
 #include "php_openssl.h"
@@ -2636,11 +2636,11 @@ static char *php_openssl_get_url_name(const char *resourcename,
 		return NULL;
 	}
 
+	char * url_name = NULL;
 	zval host_zv;
 	zend_result result = php_uri_get_host(internal_uri, URI_COMPONENT_READ_RAW, &host_zv);
 	if (result == SUCCESS && Z_TYPE(host_zv) == IS_STRING) {
 		const char * host = Z_STRVAL(host_zv);
-		char * url_name = NULL;
 		size_t len = Z_STRLEN(host_zv);
 
 		/* skip trailing dots */
@@ -2651,15 +2651,12 @@ static char *php_openssl_get_url_name(const char *resourcename,
 		if (len) {
 			url_name = pestrndup(host, len, is_persistent);
 		}
-
-		php_uri_free(internal_uri);
-		zval_ptr_dtor(&host_zv);
-		return url_name;
 	}
 
 	php_uri_free(internal_uri);
 	zval_ptr_dtor(&host_zv);
-	return NULL;
+
+	return url_name;
 }
 /* }}} */
 

ext/soap/php_http.c

@@ -336,14 +336,10 @@ static bool in_domain(const zend_string *host, const zend_string *domain)
 	}
 }
 
-int make_http_soap_request(zval        *this_ptr,
-						   zend_string *buf,
-						   zend_string *location,
-						   char        *soapaction,
-						   int          soap_version,
-						   const zend_string *uri_parser_class,
-						   zval        *return_value)
-{
+int make_http_soap_request(
+	zval *this_ptr, zend_string *buf, zend_string *location, char *soapaction,
+	int soap_version, const zend_string *uri_parser_class, zval *return_value
+) {
 	zend_string *request;
 	smart_str soap_headers = {0};
 	smart_str soap_headers_z = {0};

ext/soap/php_http.h

@@ -19,13 +19,10 @@
 #ifndef PHP_HTTP_H
 #define PHP_HTTP_H
 
-int make_http_soap_request(zval        *this_ptr,
-						   zend_string *buf,
-						   zend_string *location,
-						   char        *soapaction,
-						   int          soap_version,
-						   const zend_string *uri_parser_class,
-						   zval        *return_value);
+int make_http_soap_request(
+	zval *this_ptr, zend_string *buf, zend_string *location, char *soapaction,
+	int soap_version, const zend_string *uri_parser_class, zval *return_value
+);
 
 int proxy_authentication(zval* this_ptr, smart_str* soap_headers);
 int basic_authentication(zval* this_ptr, smart_str* soap_headers);

ext/standard/ftp_fopen_wrapper.c

@@ -38,6 +38,7 @@
 #endif
 
 #include "php_standard.h"
+#include "ext/uri/php_uri.h"
 
 #include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H

ext/standard/http_fopen_wrapper.c

@@ -20,6 +20,7 @@
 
 #include "php.h"
 #include "php_globals.h"
+#include "ext/uri/php_uri.h"
 #include "php_streams.h"
 #include "php_network.h"
 #include "php_ini.h"

ext/uri/php_uri.c

@@ -197,7 +197,6 @@ ZEND_ATTRIBUTE_NONNULL PHPAPI php_uri *php_uri_parse_to_struct(
 
 	php_uri *uri = ecalloc(1, sizeof(*uri));
 	zval tmp;
-	ZVAL_UNDEF(&tmp);
 	zend_result result;
 
 	result = php_uri_get_scheme(uri_internal, read_mode, &tmp);

ext/uri/php_uri.h

@@ -22,7 +22,7 @@
 extern zend_module_entry uri_module_entry;
 #define phpext_uri_ptr &uri_module_entry
 
-typedef struct {
+typedef struct php_uri {
 	zend_string *scheme;
 	zend_string *user;
 	zend_string *password;

main/streams/php_stream_context.h

@@ -14,8 +14,6 @@
    +----------------------------------------------------------------------+
  */
 
-#include "ext/uri/php_uri.h"
-
 /* Stream context and status notification related definitions */
 
 /* callback for status notifications */
@@ -67,7 +65,10 @@ PHPAPI void php_stream_context_set_option(php_stream_context *context,
 		const char *wrappername, const char *optionname, zval *optionvalue);
 void php_stream_context_unset_option(php_stream_context *context,
 	const char *wrappername, const char *optionname);
-PHPAPI uri_handler_t *php_stream_context_get_uri_handler(const char *wrappername, php_stream_context *context);
+
+struct uri_handler_t;
+
+PHPAPI struct uri_handler_t *php_stream_context_get_uri_handler(const char *wrappername, php_stream_context *context);
 PHPAPI php_stream_notifier *php_stream_notification_alloc(void);
 PHPAPI void php_stream_notification_free(php_stream_notifier *notifier);
 END_EXTERN_C()

main/streams/streams.c

@@ -28,6 +28,7 @@
 #include "ext/standard/file.h"
 #include "ext/standard/basic_functions.h" /* for BG(CurrentStatFile) */
 #include "ext/standard/php_string.h" /* for php_memnstr, used by php_stream_get_record() */
+#include "ext/uri/php_uri.h"
 #include <stddef.h>
 #include <fcntl.h>
 #include "php_streams_int.h"
@@ -2457,7 +2458,7 @@ void php_stream_context_unset_option(php_stream_context *context,
 }
 /* }}} */
 
-PHPAPI uri_handler_t *php_stream_context_get_uri_handler(const char *wrappername, php_stream_context *context)
+PHPAPI struct uri_handler_t *php_stream_context_get_uri_handler(const char *wrappername, php_stream_context *context)
 {
 	if (context == NULL) {
 		return php_uri_get_handler(NULL);