Skip to content

Commit d585a56

Browse files
kocsismatekocsismate
authored
Add ext/uri skeleton along with uriparser (#18658)
Relates to #14461 and https://wiki.php.net/rfc/url_parsing_api
1 parent c0865ac commit d585a56

Some content is hidden

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

43 files changed

+10166
-0
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@
3131

3232
# Vendored libraries
3333
/ext/lexbor/lexbor linguist-vendored
34+
/ext/uri/uriparser linguist-vendored

‎.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
@@ -503,6 +503,12 @@ PRIMARY MAINTAINER: Andrei Zmievski <[email protected]> (2002 - 2002)
503503
MAINTENANCE: Maintained
504504
STATUS: Working
505505
-------------------------------------------------------------------------------
506+
EXTENSION: uri
507+
PRIMARY MAINTAINER Máté Kocsis <[email protected]> (2025 - 2025)
508+
MAINTENANCE: Maintained
509+
STATUS: Working
510+
SINCE: 8.5.0
511+
-------------------------------------------------------------------------------
506512
EXTENSION: zip
507513
PRIMARY MAINTAINER: Pierre-Alain Joye <[email protected]> (2006 - 2011)
508514
Remi Collet <[email protected]> (2013-2020)

‎README.REDIST.BINS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
19. xxHash (ext/hash/xxhash)
2020
20. Lexbor (ext/lexbor/lexbor) see ext/lexbor/LICENSE
2121
21. Portions of libcperciva (ext/hash/hash_sha_{ni,sse2}.c) see the header in the source file
22+
22. uriparser (ext/uri/uriparser) see ext/uri/uriparser/COPYING
2223

2324
3. pcre2lib (ext/pcre)
2425

‎codecov.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ ignore:
99
- "ext/lexbor/lexbor/ports"
1010
- "ext/lexbor/lexbor/tag"
1111
- "ext/pcre/pcre2lib"
12+
- "ext/uri/uriparser"

‎ext/standard/credits_ext.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ CREDIT_LINE("System V Semaphores", "Tom May");
6969
CREDIT_LINE("System V Shared Memory", "Christian Cartus");
7070
CREDIT_LINE("tidy", "John Coggeshall, Ilia Alshanetsky");
7171
CREDIT_LINE("tokenizer", "Andrei Zmievski, Johannes Schlueter");
72+
CREDIT_LINE("uri", "Máté Kocsis, Tim Düsterhus, Ignace Nyamagana Butera, Arnaud Le Blanc, Dennis Snell, Niels Dossche, Nicolas Grekas");
7273
CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes");
7374
CREDIT_LINE("XMLReader", "Rob Richards");
7475
CREDIT_LINE("XMLWriter", "Rob Richards, Pierre-Alain Joye");

‎ext/uri/CREDITS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
uri
2+
Máté Kocsis, Tim Düsterhus, Ignace Nyamagana Butera, Arnaud Le Blanc, Dennis Snell, Niels Dossche, Nicolas Grekas

‎ext/uri/config.m4‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
dnl Configure options
2+
dnl
3+
4+
PHP_INSTALL_HEADERS([ext/uri], m4_normalize([
5+
php_uri.h
6+
]))
7+
8+
AC_DEFINE([URI_ENABLE_ANSI], [1], [Define to 1 for enabling ANSI support of uriparser.])
9+
AC_DEFINE([URI_NO_UNICODE], [1], [Define to 1 for disabling unicode support of uriparser.])
10+
11+
URIPARSER_DIR="uriparser"
12+
URIPARSER_SOURCES="$URIPARSER_DIR/src/UriCommon.c $URIPARSER_DIR/src/UriCompare.c $URIPARSER_DIR/src/UriEscape.c \
13+
$URIPARSER_DIR/src/UriFile.c $URIPARSER_DIR/src/UriIp4.c $URIPARSER_DIR/src/UriIp4Base.c \
14+
$URIPARSER_DIR/src/UriMemory.c $URIPARSER_DIR/src/UriNormalize.c $URIPARSER_DIR/src/UriNormalizeBase.c \
15+
$URIPARSER_DIR/src/UriParse.c $URIPARSER_DIR/src/UriParseBase.c $URIPARSER_DIR/src/UriQuery.c \
16+
$URIPARSER_DIR/src/UriRecompose.c $URIPARSER_DIR/src/UriResolve.c $URIPARSER_DIR/src/UriShorten.c"
17+
18+
PHP_NEW_EXTENSION(uri, [php_uri.c $URIPARSER_SOURCES], [no],,[-I$ext_builddir/$URIPARSER_DIR/include -DURI_STATIC_BUILD -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
19+
PHP_ADD_EXTENSION_DEP(uri, lexbor)
20+
PHP_ADD_BUILD_DIR($ext_builddir/$URIPARSER_DIR/src $ext_builddir/$URIPARSER_DIR/include)

‎ext/uri/config.w32‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
EXTENSION("uri", "php_uri.c", false /* never shared */, "/I ext/lexbor /I ext/uri/uriparser/include /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
2+
3+
AC_DEFINE("URI_ENABLE_ANSI", 1, "Define to 1 for enabling ANSI support of uriparser.")
4+
AC_DEFINE("URI_NO_UNICODE", 1, "Define to 1 for disabling unicode support of uriparser.")
5+
ADD_FLAG("CFLAGS_URI", "/D URI_STATIC_BUILD");
6+
7+
ADD_EXTENSION_DEP('uri', 'lexbor');
8+
ADD_SOURCES("ext/uri/uriparser/src", "UriCommon.c UriCompare.c UriEscape.c UriFile.c UriIp4.c UriIp4Base.c UriMemory.c UriNormalize.c UriNormalizeBase.c UriParse.c UriParseBase.c UriQuery.c UriRecompose.c UriShorten.c", "uri");
9+
PHP_INSTALL_HEADERS("ext/uri", "php_uri.h uriparser/src uriparser/include");

‎ext/uri/php_uri.c‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
/*
2+
+----------------------------------------------------------------------+
3+
| Copyright (c) The PHP Group |
4+
+----------------------------------------------------------------------+
5+
| This source file is subject to version 3.01 of the PHP license, |
6+
| that is bundled with this package in the file LICENSE, and is |
7+
| available through the world-wide-web at the following url: |
8+
| https://www.php.net/license/3_01.txt |
9+
| If you did not receive a copy of the PHP license and are unable to |
10+
| obtain it through the world-wide-web, please send a note to |
11+
| [email protected] so we can mail you a copy immediately. |
12+
+----------------------------------------------------------------------+
13+
| Authors: Máté Kocsis <[email protected]> |
14+
+----------------------------------------------------------------------+
15+
*/
16+
17+
#ifdef HAVE_CONFIG_H
18+
# include <config.h>
19+
#endif
20+
21+
#include "php.h"
22+
#include "Zend/zend_interfaces.h"
23+
#include "Zend/zend_exceptions.h"
24+
#include "Zend/zend_attributes.h"
25+
#include "main/php_ini.h"
26+
#include "ext/standard/info.h"
27+
28+
#include "php_uri.h"
29+
#include "php_uri_arginfo.h"
30+
#include "uriparser/src/UriConfig.h"
31+
32+
zend_class_entry *uri_exception_ce;
33+
zend_class_entry *invalid_uri_exception_ce;
34+
zend_class_entry *whatwg_invalid_url_exception_ce;
35+
36+
#define URIPARSER_VERSION PACKAGE_VERSION
37+
38+
static const zend_module_dep uri_deps[] = {
39+
ZEND_MOD_REQUIRED("lexbor")
40+
ZEND_MOD_END
41+
};
42+
43+
44+
static PHP_MINIT_FUNCTION(uri)
45+
{
46+
uri_exception_ce = register_class_Uri_UriException(zend_ce_exception);
47+
invalid_uri_exception_ce = register_class_Uri_InvalidUriException(uri_exception_ce);
48+
whatwg_invalid_url_exception_ce = register_class_Uri_WhatWg_InvalidUrlException(invalid_uri_exception_ce);
49+
50+
return SUCCESS;
51+
}
52+
53+
static PHP_MINFO_FUNCTION(uri)
54+
{
55+
php_info_print_table_start();
56+
php_info_print_table_row(2, "uri support", "active");
57+
php_info_print_table_row(2, "uriparser library version", URIPARSER_VERSION);
58+
php_info_print_table_end();
59+
}
60+
61+
static PHP_MSHUTDOWN_FUNCTION(uri)
62+
{
63+
64+
return SUCCESS;
65+
}
66+
67+
PHP_RINIT_FUNCTION(uri)
68+
{
69+
70+
return SUCCESS;
71+
}
72+
73+
PHP_RSHUTDOWN_FUNCTION(uri)
74+
{
75+
return SUCCESS;
76+
}
77+
78+
zend_module_entry uri_module_entry = {
79+
STANDARD_MODULE_HEADER_EX, NULL,
80+
uri_deps,
81+
"uri", /* Extension name */
82+
NULL, /* zend_function_entry */
83+
PHP_MINIT(uri), /* PHP_MINIT - Module initialization */
84+
PHP_MSHUTDOWN(uri), /* PHP_MSHUTDOWN - Module shutdown */
85+
PHP_RINIT(uri), /* PHP_RINIT - Request initialization */
86+
PHP_RSHUTDOWN(uri), /* PHP_RSHUTDOWN - Request shutdown */
87+
PHP_MINFO(uri), /* PHP_MINFO - Module info */
88+
PHP_VERSION, /* Version */
89+
STANDARD_MODULE_PROPERTIES
90+
};

0 commit comments

Comments
 (0)