Skip to content

Commit 5de5216

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: uri: Update to uriparser-1.0.0 (#20715)
2 parents 0d7e535 + 4a5a328 commit 5de5216

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

ext/uri/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if test "$PHP_EXTERNAL_URIPARSER" = "no"; then
3333
$URIPARSER_DIR/src/UriSetScheme.c $URIPARSER_DIR/src/UriSetUserInfo.c $URIPARSER_DIR/src/UriShorten.c $URIPARSER_DIR/src/UriVersion.c"
3434
URI_CFLAGS="-DURI_STATIC_BUILD"
3535
else
36-
PKG_CHECK_MODULES([LIBURIPARSER], [liburiparser >= 0.9.10])
36+
PKG_CHECK_MODULES([LIBURIPARSER], [liburiparser >= 1.0.0])
3737
PHP_EVAL_LIBLINE([$LIBURIPARSER_LIBS], [URI_SHARED_LIBADD])
3838
PHP_EVAL_INCLINE([$LIBURIPARSER_CFLAGS])
3939
fi

ext/uri/uriparser/include/uriparser/Uri.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* 207ee4485d5a4690064bec14d369884451a49ae32e907b5bc6502c2bfa338ca1 (0.9.9+)
1+
/* 5abed1007be99942f49ffe603a894d277066b79b9cb824547af0f3b9481cb9ca (1.0.0+)
22
*
33
* uriparser - RFC 3986 URI parsing library
44
*

ext/uri/uriparser/include/uriparser/UriBase.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
# define URI_ANSI_TO_UNICODE(x) URI_ANSI_TO_UNICODE_HELPER(x)
5151

5252
/* Version */
53-
# define URI_VER_MAJOR 0
54-
# define URI_VER_MINOR 9
55-
# define URI_VER_RELEASE 9
53+
# define URI_VER_MAJOR 1
54+
# define URI_VER_MINOR 0
55+
# define URI_VER_RELEASE 0
5656
# define URI_VER_SUFFIX_ANSI ""
5757
# define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI)
5858

@@ -394,7 +394,7 @@ URI_PUBLIC int uriTestMemoryManager(UriMemoryManager * memory);
394394
* @see uriEmulateReallocarray
395395
* @see UriMemoryManager
396396
* @see uriTestMemoryManager
397-
* @since 0.9.10
397+
* @since 1.0.0
398398
*/
399399
URI_PUBLIC int uriTestMemoryManagerEx(UriMemoryManager * memory,
400400
UriBool challengeAlignment);

0 commit comments

Comments
 (0)