php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.5'

Browse Source 
* PHP-8.5:
  uri: Update to uriparser-1.0.0 (#20715)
This commit is contained in:
Tim Düsterhus
2025-12-15 23:06:25 +01:00
parent 0d7e53535b 4a5a328f26
commit 5de52168d0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/uri/config.m4
View File

@@ -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

2
ext/uri/uriparser/include/uriparser/Uri.h
View File

@@ -1,4 +1,4 @@
/* 207ee4485d5a4690064bec14d369884451a49ae32e907b5bc6502c2bfa338ca1 (0.9.9+)
/* 5abed1007be99942f49ffe603a894d277066b79b9cb824547af0f3b9481cb9ca (1.0.0+)
*
* uriparser - RFC 3986 URI parsing library
*

8
ext/uri/uriparser/include/uriparser/UriBase.h
View File

@@ -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);