Commit 4a5a328f265 for php.net
commit 4a5a328f26594759ba5a02aaf13b607812ef85da
Author: Tim Düsterhus <tim@bastelstu.be>
Date: Mon Dec 15 23:06:17 2025 +0100
uri: Update to uriparser-1.0.0 (#20715)
We're now cleanly back on a released version. No functional changes since the
last import of the library.
Version 0.9.10 never existed, the minimum version in config.m4 was already
increased in anticipation of a new release that contained necessary bugfixes to
prevent building against a uriparser without these fixes. It therefore also is
adjusted to 1.0.0 for correctness without having an impact.
diff --git a/ext/uri/config.m4 b/ext/uri/config.m4
index 99e0d6b4767..390d8eb223c 100644
--- a/ext/uri/config.m4
+++ b/ext/uri/config.m4
@@ -33,7 +33,7 @@ if test "$PHP_EXTERNAL_URIPARSER" = "no"; then
$URIPARSER_DIR/src/UriSetScheme.c $URIPARSER_DIR/src/UriSetUserInfo.c $URIPARSER_DIR/src/UriShorten.c $URIPARSER_DIR/src/UriVersion.c"
URI_CFLAGS="-DURI_STATIC_BUILD"
else
- PKG_CHECK_MODULES([LIBURIPARSER], [liburiparser >= 0.9.10])
+ PKG_CHECK_MODULES([LIBURIPARSER], [liburiparser >= 1.0.0])
PHP_EVAL_LIBLINE([$LIBURIPARSER_LIBS], [URI_SHARED_LIBADD])
PHP_EVAL_INCLINE([$LIBURIPARSER_CFLAGS])
fi
diff --git a/ext/uri/uriparser/include/uriparser/Uri.h b/ext/uri/uriparser/include/uriparser/Uri.h
index ea52097d6de..88976a48462 100644
--- a/ext/uri/uriparser/include/uriparser/Uri.h
+++ b/ext/uri/uriparser/include/uriparser/Uri.h
@@ -1,4 +1,4 @@
-/* 207ee4485d5a4690064bec14d369884451a49ae32e907b5bc6502c2bfa338ca1 (0.9.9+)
+/* 5abed1007be99942f49ffe603a894d277066b79b9cb824547af0f3b9481cb9ca (1.0.0+)
*
* uriparser - RFC 3986 URI parsing library
*
diff --git a/ext/uri/uriparser/include/uriparser/UriBase.h b/ext/uri/uriparser/include/uriparser/UriBase.h
index f8256951fe3..3a9a868e3bb 100644
--- a/ext/uri/uriparser/include/uriparser/UriBase.h
+++ b/ext/uri/uriparser/include/uriparser/UriBase.h
@@ -50,9 +50,9 @@
# define URI_ANSI_TO_UNICODE(x) URI_ANSI_TO_UNICODE_HELPER(x)
/* Version */
-# define URI_VER_MAJOR 0
-# define URI_VER_MINOR 9
-# define URI_VER_RELEASE 9
+# define URI_VER_MAJOR 1
+# define URI_VER_MINOR 0
+# define URI_VER_RELEASE 0
# define URI_VER_SUFFIX_ANSI ""
# define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI)
@@ -394,7 +394,7 @@ URI_PUBLIC int uriTestMemoryManager(UriMemoryManager * memory);
* @see uriEmulateReallocarray
* @see UriMemoryManager
* @see uriTestMemoryManager
- * @since 0.9.10
+ * @since 1.0.0
*/
URI_PUBLIC int uriTestMemoryManagerEx(UriMemoryManager * memory,
UriBool challengeAlignment);