Skip to content

[pull] master from php:master #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Jul 7, 2025
Merged

[pull] master from php:master #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa366b5
Update re2c minimum versions in Windows checks and docs (#19039)
petk Jul 7, 2025
c2af281
Use <winsock2.h> instead of legacy <winsock.h> (#19037)
petk Jul 7, 2025
258fbd6
Fix -Wuseless-escape warnings emitted by re2c (#19050)
petk Jul 7, 2025
ab6e730
Merge branch 'PHP-8.3' into PHP-8.4
petk Jul 7, 2025
3b45b9d
Merge branch 'PHP-8.4'
petk Jul 7, 2025
b068ee3
Fix unreachable code in URL output handler (#19056)
cla7aye15I4nd Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Zend/zend_ini_scanner.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,16 +352,16 @@ restart:
/*!re2c
re2c:yyfill:check = 0;
LNUM [0-9]+
DNUM ([0-9]*[\.][0-9]+)|([0-9]+[\.][0-9]*)
DNUM ([0-9]*[.][0-9]+)|([0-9]+[.][0-9]*)
NUMBER [-]?{LNUM}|{DNUM}
ANY_CHAR (.|[\n\t])
NEWLINE ("\r"|"\n"|"\r\n")
TABS_AND_SPACES [ \t]
WHITESPACE [ \t]+
CONSTANT [a-zA-Z_][a-zA-Z0-9_]*
LABEL_CHAR [^=\n\r\t;&|^$~(){}!"\[\]\x00]
LABEL_CHAR [^=\n\r\t;&|^$~(){}!"[\]\x00]
LABEL ({LABEL_CHAR}+)
TOKENS [:,.\[\]"'()&|^+-/*=%$!~<>?@{}]
TOKENS [:,.[\]"'()&|^+-/*=%$!~<>?@{}]
OPERATORS [&|^~()!]
DOLLAR_CURLY "${"

Expand Down
4 changes: 2 additions & 2 deletions Zend/zend_language_scanner.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1817,11 +1817,11 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
RETURN_TOKEN(T_MUL_EQUAL);
}

<ST_IN_SCRIPTING>"*\*" {
<ST_IN_SCRIPTING>"**" {
RETURN_TOKEN(T_POW);
}

<ST_IN_SCRIPTING>"*\*=" {
<ST_IN_SCRIPTING>"**=" {
RETURN_TOKEN(T_POW_EQUAL);
}

Expand Down
8 changes: 4 additions & 4 deletions docs/release-process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ slightly different steps. We'll call attention where the steps differ.
> Do *not* bump the API versions after RC1.

5. Compile and run `make test`, with and without ZTS (Zend Thread Safety), using
the correct Bison and re2c versions, e.g., for PHP 7.4, Bison 3.0.0 and re2c
0.13.4 are required, as a minimum.
the correct Bison and re2c versions, e.g., for PHP 8.5, Bison 3.0.0 and re2c
1.0.3 are required, as a minimum.

For example:

Expand Down Expand Up @@ -555,8 +555,8 @@ slightly different steps. We'll call attention where the steps differ.
an example.

6. Compile and run `make test`, with and without ZTS (Zend Thread Safety), using
the correct Bison and re2c versions, e.g., for PHP 7.4, Bison 3.0.0 and re2c
0.13.4 are required, as a minimum.
the correct Bison and re2c versions, e.g., for PHP 8.5, Bison 3.0.0 and re2c
1.0.3 are required, as a minimum.

For example:

Expand Down
2 changes: 1 addition & 1 deletion ext/mysqlnd/mysqlnd_vio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#ifndef PHP_WIN32
#include <netinet/tcp.h>
#else
#include <winsock.h>
#include <winsock2.h>
#endif


Expand Down
3 changes: 1 addition & 2 deletions ext/sockets/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ ARG_ENABLE("sockets", "SOCKETS support", "no");

if (PHP_SOCKETS != "no") {
if (CHECK_LIB("ws2_32.lib", "sockets", PHP_SOCKETS)
&& CHECK_LIB("Iphlpapi.lib", "sockets", PHP_SOCKETS)
&& CHECK_HEADER_ADD_INCLUDE("winsock.h", "CFLAGS_SOCKETS")) {
&& CHECK_LIB("Iphlpapi.lib", "sockets", PHP_SOCKETS)) {
EXTENSION('sockets', 'sockets.c multicast.c conversions.c sockaddr_conv.c sendrecvmsg.c', PHP_SOCKETS_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
AC_DEFINE('HAVE_SOCKETS', 1, "Define to 1 if the PHP extension 'sockets' is available.");
PHP_INSTALL_HEADERS("ext/sockets", "php_sockets.h windows_common.h");
Expand Down
4 changes: 1 addition & 3 deletions ext/standard/url_scanner_ex.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ static inline void php_url_scanner_session_handler_impl(char *output, size_t out
len = UINT_MAX;
}
*handled_output_len = len;
} else if (ZSTR_LEN(url_state->url_app.s) == 0) {
} else {
url_adapt_state_ex_t *ctx = url_state;
if (ctx->buf.s && ZSTR_LEN(ctx->buf.s)) {
smart_str_append(&ctx->result, ctx->buf.s);
Expand All @@ -715,8 +715,6 @@ static inline void php_url_scanner_session_handler_impl(char *output, size_t out
} else {
*handled_output = estrndup(output, *handled_output_len = output_len);
}
} else {
*handled_output = NULL;
}
}

Expand Down
2 changes: 1 addition & 1 deletion sapi/phpdbg/phpdbg_lexer.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ T_IF 'if'
T_RUN 'run'
T_RUN_SHORT "r"
WS [ \r\t]+
DIGITS [-]?[0-9\.]+
DIGITS [-]?[0-9.]+
ID [^ \r\n\t:#\000]+
GENERIC_ID ([^ \r\n\t:#\000"']|":\\")+|["]([^\n\000"\\]|"\\\\"|"\\"["])+["]|[']([^\n\000'\\]|"\\\\"|"\\"['])+[']
ADDR [0][x][a-fA-F0-9]+
Expand Down
2 changes: 1 addition & 1 deletion win32/build/confutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ var WINVER = "0x0602"; /* 8/2012 */
var MINBISON = "3.0.0";

// There's a minimum requirement for re2c..
var MINRE2C = "0.13.4";
var MINRE2C = "1.0.3";

/* Store the enabled extensions (summary + QA check) */
var extensions_enabled = new Array();
Expand Down