Skip to content

[pull] master from php:master #772

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 4 commits into from
Mar 9, 2026
Merged

[pull] master from php:master #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f38058d
ext/pcntl: Bump num_signals to uint16_t (#21347)
NattyNarwhal Mar 9, 2026
06f9389
Update NEWS for pcntl fix [skip ci]
NattyNarwhal Mar 9, 2026
d81db0b
Merge branch 'PHP-8.5'
NattyNarwhal Mar 9, 2026
0155b50
phar: Fix const-generic compile warnings
ndossche Mar 9, 2026
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
3 changes: 2 additions & 1 deletion ext/pcntl/php_pcntl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ ZEND_BEGIN_MODULE_GLOBALS(pcntl)
bool processing_signal_queue;
volatile bool pending_signals;
bool async_signals;
uint8_t num_signals;
/* some OSes define NSIG to be > UINT8_MAX */
uint16_t num_signals;
int last_error;
struct php_pcntl_pending_signal *head, *tail, *spares;
ZEND_END_MODULE_GLOBALS(pcntl)
Expand Down
8 changes: 3 additions & 5 deletions ext/phar/phar_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ static zend_class_entry *phar_ce_entry;

static int phar_file_type(const HashTable *mimes, const char *file, char **mime_type) /* {{{ */
{
char *ext;
phar_mime_type *mime;
ext = strrchr(file, '.');
const char *ext = strrchr(file, '.');
if (!ext) {
*mime_type = "text/plain";
/* no file extension = assume text/plain */
Expand Down Expand Up @@ -347,10 +346,9 @@ static void phar_do_404(phar_archive_data *phar, char *fname, size_t fname_len,
/* post-process REQUEST_URI and retrieve the actual request URI. This is for
cases like http://localhost/blah.phar/path/to/file.php/extra/stuff
which calls "blah.phar" file "path/to/file.php" with PATH_INFO "/extra/stuff" */
static void phar_postprocess_ru_web(const char *fname, size_t fname_len, const char *entry, size_t *entry_len, char **ru, size_t *ru_len) /* {{{ */
static void phar_postprocess_ru_web(char *fname, size_t fname_len, char *entry, size_t *entry_len, char **ru, size_t *ru_len) /* {{{ */
{
const char *e = entry + 1;
char *u = NULL, *u1 = NULL, *saveu = NULL;
char *e = entry + 1, *u1 = NULL, *u = NULL, *saveu = NULL;
size_t e_len = *entry_len - 1, u_len = 0;
phar_archive_data *pphar;

Expand Down
3 changes: 2 additions & 1 deletion ext/phar/tar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ bool phar_is_tar(const char *buf, const char *fname) /* {{{ */
tar_header *header = (tar_header *) buf;
uint32_t checksum = phar_tar_number(header->checksum, sizeof(header->checksum));
bool is_tar;
char save[sizeof(header->checksum)], *bname;
char save[sizeof(header->checksum)];
const char *bname;

/* assume that the first filename in a tar won't begin with <?php */
if (!strncmp(buf, "<?php", sizeof("<?php")-1)) {
Expand Down