Skip to content

Add FrankenPHP to sapi credits #1

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

Open
wants to merge 5 commits into
base: frankenphp-8.2
Choose a base branch
from
Open

Add FrankenPHP to sapi credits #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b9f38f
Set SA_ONSTACK in zend_sigaction
dunglas Sep 22, 2022
bed381d
opcache: add FrankenPHP to the allow list
dunglas May 10, 2022
bb77291
support using SIGALARM instead of SIGPROF for Go compatibility
dunglas Oct 13, 2022
e908f78
Add FrankenPHP to SAPI credits
alexander-schranz Oct 18, 2022
1ee4c45
Add FrankenPHP Extensions and Credits
alexander-schranz Oct 18, 2022
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
5 changes: 5 additions & 0 deletions EXTENSIONS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ PRIMARY MAINTAINER: Joe Watkins <[email protected]>, Bob Weinand <[email protected]>
MAINTENANCE: Unknown
STATUS: 5.6
-------------------------------------------------------------------------------
EXTENSION: frankenPHP
PRIMARY MAINTAINER: Kévin Dunglas <[email protected]>
MAINTENANCE: Maintained
STATUS: 8.2
-------------------------------------------------------------------------------


== Database extensions ==
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend_execute_API.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1463,7 +1463,7 @@ static void zend_set_timeout_ex(zend_long seconds, bool reset_signals) /* {{{ */
t_r.it_value.tv_sec = seconds;
t_r.it_value.tv_usec = t_r.it_interval.tv_sec = t_r.it_interval.tv_usec = 0;

# if defined(__CYGWIN__) || defined(__PASE__)
# if defined(__CYGWIN__) || defined(__PASE__) || defined(NO_SIGPROF)
setitimer(ITIMER_REAL, &t_r, NULL);
}
signo = SIGALRM;
Expand Down
4 changes: 2 additions & 2 deletions Zend/zend_signal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ ZEND_API zend_signal_globals_t zend_signal_globals;
static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context);
static int zend_signal_register(int signo, void (*handler)(int, siginfo_t*, void*));

#if defined(__CYGWIN__) || defined(__PASE__)
#if defined(__CYGWIN__) || defined(__PASE__) || defined(NO_SIGPROF)
/* Matches zend_execute_API.c; these platforms don't support ITIMER_PROF. */
#define TIMEOUT_SIG SIGALRM
#else
Expand Down Expand Up @@ -248,7 +248,7 @@ ZEND_API void zend_sigaction(int signo, const struct sigaction *act, struct siga
if (SIGG(handlers)[signo-1].handler == (void *) SIG_IGN) {
sa.sa_sigaction = (void *) SIG_IGN;
} else {
sa.sa_flags = SA_SIGINFO | (act->sa_flags & SA_FLAGS_MASK);
sa.sa_flags = SA_ONSTACK | SA_SIGINFO | (act->sa_flags & SA_FLAGS_MASK);
sa.sa_sigaction = zend_signal_handler_defer;
sa.sa_mask = global_sigmask;
}
Expand Down
3 changes: 2 additions & 1 deletion ext/opcache/ZendAccelerator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2824,6 +2824,7 @@ static inline int accel_find_sapi(void)
"litespeed",
"uwsgi",
"fuzzer",
"frankenphp",
NULL
};
const char **sapi_name;
Expand Down Expand Up @@ -3156,7 +3157,7 @@ static int accel_startup(zend_extension *extension)
strcmp(sapi_module.name, "cli") == 0) {
zps_startup_failure("Opcode Caching is disabled for CLI", NULL, accelerator_remove_cb);
} else {
zps_startup_failure("Opcode Caching is only supported in Apache, FPM, FastCGI and LiteSpeed SAPIs", NULL, accelerator_remove_cb);
zps_startup_failure("Opcode Caching is only supported in Apache, FPM, FastCGI, FrankenPHP, LiteSpeed and uWSGI SAPIs", NULL, accelerator_remove_cb);
}
return SUCCESS;
}
Expand Down
1 change: 1 addition & 0 deletions ext/standard/credits_sapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ CREDIT_LINE("Embed", "Edin Kadribasic");
CREDIT_LINE("FastCGI Process Manager", "Andrei Nigmatulin, dreamcat4, Antony Dovgal, Jerome Loyet");
CREDIT_LINE("litespeed", "George Wang");
CREDIT_LINE("phpdbg", "Felipe Pena, Joe Watkins, Bob Weinand");
CREDIT_LINE("FrankenPHP", "Kévin Dunglas");
2 changes: 2 additions & 0 deletions sapi/frankenphp/CREDITS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FrankenPHP
Kévin Dunglas