Some extension fixes

kocsismate · kocsismate · commit b75cc5bfca63 · 2025-05-25T18:49:32.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -31,3 +31,4 @@
 
 # Vendored libraries
 /ext/lexbor/lexbor linguist-vendored
+/ext/uri/uriparser linguist-vendored
diff --git a/README.REDIST.BINS b/README.REDIST.BINS
@@ -19,6 +19,7 @@
 19. xxHash (ext/hash/xxhash)
 20. Lexbor (ext/lexbor/lexbor) see ext/lexbor/LICENSE
 21. Portions of libcperciva (ext/hash/hash_sha_{ni,sse2}.c) see the header in the source file
+22. uriparser (ext/uri/uriparser) see ext/uri/uriparser/COPYING
 
 3. pcre2lib (ext/pcre)
 
diff --git a/codecov.yml b/codecov.yml
@@ -7,5 +7,10 @@ ignore:
   - "ext/lexbor/lexbor/html"
   - "ext/lexbor/lexbor/ns"
   - "ext/lexbor/lexbor/ports"
+  - "ext/lexbor/lexbor/punycode"
   - "ext/lexbor/lexbor/tag"
+  - "ext/lexbor/lexbor/unicode"
+  - "ext/lexbor/lexbor/url"
   - "ext/pcre/pcre2lib"
+  - "ext/uri/uriparser/include"
+  - "ext/uri/uriparser/src"
diff --git a/ext/uri/php_uri.c b/ext/uri/php_uri.c
@@ -42,6 +42,11 @@ zend_class_entry *whatwg_invalid_url_exception_ce;
 zend_class_entry *whatwg_url_validation_error_type_ce;
 zend_class_entry *whatwg_url_validation_error_ce;
 
+static const zend_module_dep uri_deps[] = {
+	ZEND_MOD_REQUIRED("lexbor")
+	ZEND_MOD_END
+};
+
 static zend_array uri_handlers;
 
 static zend_object *uri_clone_obj_handler(zend_object *object);
@@ -1037,15 +1042,16 @@ PHP_RSHUTDOWN_FUNCTION(uri)
 }
 
 zend_module_entry uri_module_entry = {
-	STANDARD_MODULE_HEADER,
-	"uri",                             /* Extension name */
+	STANDARD_MODULE_HEADER_EX, NULL,
+	uri_deps,
+	"uri",                          /* Extension name */
 	NULL,                           /* zend_function_entry */
-	PHP_MINIT(uri),         /* PHP_MINIT - Module initialization */
-	PHP_MSHUTDOWN(uri),   /* PHP_MSHUTDOWN - Module shutdown */
-	PHP_RINIT(uri),         /* PHP_RINIT - Request initialization */
-	PHP_RSHUTDOWN(uri),   /* PHP_RSHUTDOWN - Request shutdown */
-	PHP_MINFO(uri),                  /* PHP_MINFO - Module info */
-	PHP_VERSION,                      /* Version */
+	PHP_MINIT(uri),                 /* PHP_MINIT - Module initialization */
+	PHP_MSHUTDOWN(uri),             /* PHP_MSHUTDOWN - Module shutdown */
+	PHP_RINIT(uri),                 /* PHP_RINIT - Request initialization */
+	PHP_RSHUTDOWN(uri),             /* PHP_RSHUTDOWN - Request shutdown */
+	PHP_MINFO(uri),                 /* PHP_MINFO - Module info */
+	PHP_VERSION,                    /* Version */
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/uri/php_uriparser.c b/ext/uri/php_uriparser.c
@@ -75,7 +75,7 @@ static void uriparser_copy_text_range(UriTextRangeA *text_range, UriTextRangeA *
 	}
 }
 
-static UriUriA *uriparser_copy_uri(UriUriA *uriparser_uri)
+static UriUriA *uriparser_copy_uri(UriUriA *uriparser_uri) // TODO add to uriparser
 {
 	UriUriA *new_uriparser_uri = emalloc(sizeof(UriUriA));
 
@@ -574,7 +574,7 @@ static void *uriparser_reallocarray(UriMemoryManager *memory_manager, void *ptr,
 	return erealloc(ptr, total_size);
 }
 
-static void uriparser_free(UriMemoryManager *memory_manager, void * ptr)
+static void uriparser_free(UriMemoryManager *memory_manager, void *ptr)
 {
 	efree(ptr);
 }
diff --git a/ext/uri/uriparser/COPYING b/ext/uri/uriparser/COPYING
@@ -0,0 +1,36 @@
+uriparser - RFC 3986 URI parsing library
+
+Copyright (C) 2007, Weijia Song <songweijia@gmail.com>
+Copyright (C) 2007, Sebastian Pipping <sebastian@pipping.org>
+All rights reserved.
+
+Redistribution and use in source  and binary forms, with or without
+modification, are permitted provided  that the following conditions
+are met:
+
+    1. Redistributions  of  source  code   must  retain  the  above
+       copyright notice, this list  of conditions and the following
+       disclaimer.
+
+    2. Redistributions  in binary  form  must  reproduce the  above
+       copyright notice, this list  of conditions and the following
+       disclaimer  in  the  documentation  and/or  other  materials
+       provided with the distribution.
+
+    3. Neither the  name of the  copyright holder nor the  names of
+       its contributors may be used  to endorse or promote products
+       derived from  this software  without specific  prior written
+       permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND  ANY EXPRESS OR IMPLIED WARRANTIES,  INCLUDING, BUT NOT
+LIMITED TO,  THE IMPLIED WARRANTIES OF  MERCHANTABILITY AND FITNESS
+FOR  A  PARTICULAR  PURPOSE  ARE  DISCLAIMED.  IN  NO  EVENT  SHALL
+THE  COPYRIGHT HOLDER  OR CONTRIBUTORS  BE LIABLE  FOR ANY  DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA,  OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT  LIABILITY,  OR  TORT (INCLUDING  NEGLIGENCE  OR  OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/scripts/dev/tidy.php b/scripts/dev/tidy.php
@@ -24,6 +24,7 @@
     // Bundled libraries / files.
     'ext/date/lib/',
     'ext/lexbor/lexbor/',
+    'ext/uri/uriparser/',
     'ext/fileinfo/data_file.c',
     'ext/fileinfo/libmagic/',
     'ext/gd/libgd/',

Original file line number	Diff line number	Diff line change
`@@ -31,3 +31,4 @@`
`31`	`31`
`32`	`32`	`# Vendored libraries`
`33`	`33`	`/ext/lexbor/lexbor linguist-vendored`
	`34`	`+/ext/uri/uriparser linguist-vendored`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ static void uriparser_copy_text_range(UriTextRangeA text_range, UriTextRangeA `
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`-static UriUriA uriparser_copy_uri(UriUriA uriparser_uri)`
	`78`	`+static UriUriA uriparser_copy_uri(UriUriA uriparser_uri) // TODO add to uriparser`
`79`	`79`	`{`
`80`	`80`	`UriUriA *new_uriparser_uri = emalloc(sizeof(UriUriA));`
`81`	`81`
`@@ -574,7 +574,7 @@ static void uriparser_reallocarray(UriMemoryManager memory_manager, void *ptr,`
`574`	`574`	`return erealloc(ptr, total_size);`
`575`	`575`	`}`
`576`	`576`
`577`		`-static void uriparser_free(UriMemoryManager memory_manager, void ptr)`
	`577`	`+static void uriparser_free(UriMemoryManager memory_manager, void ptr)`
`578`	`578`	`{`
`579`	`579`	`efree(ptr);`
`580`	`580`	`}`