Skip to content

Commit 0ccffa0

Browse files
committed
Add RFC 3986 and WHATWG compliant URL parsing support
1 parent 0f2f7c6 commit 0ccffa0

File tree

219 files changed

+279063
-487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+279063
-487
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ freebsd_task:
1414
- pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif
1515
script:
1616
- ./buildconf -f
17-
- ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
17+
- ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --enable-uri --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
1818
- gmake -j2
1919
- mkdir /etc/php.d
2020
- gmake install

.github/actions/configure-macos/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ runs:
4747
--enable-pcntl \
4848
--with-readline="$BREW_OPT"/readline \
4949
--enable-mbstring \
50+
--enable-uri \
5051
--with-curl \
5152
--with-gettext="$BREW_OPT"/gettext \
5253
--enable-sockets \

.github/actions/configure-x64/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ runs:
4343
--enable-pcntl \
4444
--with-readline \
4545
--enable-mbstring \
46+
--enable-uri \
4647
--with-curl \
4748
--with-gettext \
4849
--enable-sockets \

.github/labeler.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,11 @@
320320
- any-glob-to-any-file:
321321
- ext/tokenizer/**/*
322322

323+
"Extension: uri":
324+
- changed-files:
325+
- any-glob-to-any-file:
326+
- ext/uri/**/*
327+
323328
"Extension: xml":
324329
- changed-files:
325330
- any-glob-to-any-file:

EXTENSIONS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,12 @@ PRIMARY MAINTAINER: Andrei Zmievski <andrei@php.net> (2002 - 2002)
493493
MAINTENANCE: Maintained
494494
STATUS: Working
495495
-------------------------------------------------------------------------------
496+
EXTENSION: uri
497+
PRIMARY MAINTAINER Máté Kocsis <kocsismate@php.net> (2024 - 2024)
498+
MAINTENANCE: Maintained
499+
STATUS: Working
500+
SINCE: 8.5.0
501+
-------------------------------------------------------------------------------
496502
EXTENSION: zip
497503
PRIMARY MAINTAINER: Pierre-Alain Joye <pajoye@php.net> (2006 - 2011)
498504
Remi Collet <remi@php.net> (2013-2020)

Zend/zend_API.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3488,9 +3488,16 @@ static zend_class_entry *do_register_internal_class(zend_class_entry *orig_class
34883488
*/
34893489
ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce) /* {{{ */
34903490
{
3491-
zend_class_entry *register_class;
3491+
return zend_register_internal_class_with_flags(class_entry, parent_ce, 0);
3492+
}
3493+
/* }}} */
34923494

3493-
register_class = zend_register_internal_class(class_entry);
3495+
ZEND_API zend_class_entry *zend_register_internal_class_with_flags(
3496+
zend_class_entry *class_entry,
3497+
zend_class_entry *parent_ce,
3498+
uint32_t ce_flags
3499+
) {
3500+
zend_class_entry *register_class = do_register_internal_class(class_entry, ce_flags);
34943501

34953502
if (parent_ce) {
34963503
zend_do_inheritance(register_class, parent_ce);
@@ -3499,7 +3506,6 @@ ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *cla
34993506

35003507
return register_class;
35013508
}
3502-
/* }}} */
35033509

35043510
ZEND_API void zend_class_implements(zend_class_entry *class_entry, int num_interfaces, ...) /* {{{ */
35053511
{

Zend/zend_API.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@ ZEND_API void zend_add_magic_method(zend_class_entry *ce, zend_function *fptr, z
390390

391391
ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry);
392392
ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce);
393+
ZEND_API zend_class_entry *zend_register_internal_class_with_flags(zend_class_entry *class_entry, zend_class_entry *parent_ce, uint32_t flags);
393394
ZEND_API zend_class_entry *zend_register_internal_interface(zend_class_entry *orig_class_entry);
394395
ZEND_API void zend_class_implements(zend_class_entry *class_entry, int num_interfaces, ...);
395396

Zend/zend_attributes_arginfo.h

Lines changed: 7 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Zend/zend_builtin_functions_arginfo.h

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Zend/zend_closures_arginfo.h

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy