mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-20 03:44:18 +08:00
90 lines
3.3 KiB
Diff
90 lines
3.3 KiB
Diff
diff -ruwN source/configure source-new/configure
|
|
--- source/configure 2025-08-26 20:36:28.000000000 +0700
|
|
+++ source-new/configure 2025-09-26 16:31:28.871157195 +0700
|
|
@@ -25863,7 +25863,7 @@
|
|
then :
|
|
ac_cv_lib_curl_curl_easy_perform=yes
|
|
else case e in #(
|
|
- e) ac_cv_lib_curl_curl_easy_perform=no ;;
|
|
+ e) ac_cv_lib_curl_curl_easy_perform=yes ;;
|
|
esac
|
|
fi
|
|
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
@@ -37356,7 +37356,7 @@
|
|
then :
|
|
php_cv_lib_gd_works=yes
|
|
else case e in #(
|
|
- e) php_cv_lib_gd_works=no ;;
|
|
+ e) php_cv_lib_gd_works=yes ;;
|
|
esac
|
|
fi
|
|
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
@@ -40056,7 +40056,7 @@
|
|
LIBS_SAVED=$LIBS
|
|
CFLAGS="$CFLAGS $GMP_CFLAGS"
|
|
LIBS="$LIBS $GMP_LIBS"
|
|
- gmp_check=no
|
|
+ gmp_check=yes
|
|
ac_fn_c_check_header_compile "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"
|
|
if test "x$ac_cv_header_gmp_h" = xyes
|
|
then :
|
|
diff -ruwN source/ext/phar/Makefile.frag source-new/ext/phar/Makefile.frag
|
|
--- source/ext/phar/Makefile.frag 2025-08-26 20:36:28.000000000 +0700
|
|
+++ source-new/ext/phar/Makefile.frag 2025-09-26 16:31:29.029526842 +0700
|
|
@@ -30,7 +30,7 @@
|
|
-@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc
|
|
|
|
TEST_PHP_EXECUTABLE = $(shell $(PHP_EXECUTABLE) -v 2>&1)
|
|
-TEST_PHP_EXECUTABLE_RES = $(shell echo "$(TEST_PHP_EXECUTABLE)" | grep -c 'Exec format error')
|
|
+TEST_PHP_EXECUTABLE_RES = $(shell echo "$(TEST_PHP_EXECUTABLE)" | grep -E -c 'Exec format error|required file not found')
|
|
|
|
$(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
|
|
-@(echo "Generating phar.php"; \
|
|
diff -ruwN source/ext/posix/posix.c source-new/ext/posix/posix.c
|
|
--- source/ext/posix/posix.c 2025-08-26 20:36:28.000000000 +0700
|
|
+++ source-new/ext/posix/posix.c 2025-09-26 16:31:29.085983450 +0700
|
|
@@ -375,7 +375,7 @@
|
|
|
|
ZEND_PARSE_PARAMETERS_NONE();
|
|
|
|
- if ((ticks = times(&t)) == -1) {
|
|
+ {
|
|
POSIX_G(last_error) = errno;
|
|
RETURN_FALSE;
|
|
}
|
|
diff -ruwN source/sapi/fpm/fpm/fpm_status.c source-new/sapi/fpm/fpm/fpm_status.c
|
|
--- source/sapi/fpm/fpm/fpm_status.c 2025-08-26 20:36:28.000000000 +0700
|
|
+++ source-new/sapi/fpm/fpm/fpm_status.c 2025-09-27 01:07:38.657514932 +0700
|
|
@@ -104,11 +104,15 @@
|
|
}
|
|
proc_p = &procs[i];
|
|
/* prevent NaN */
|
|
+#ifdef HAVE_TIMES
|
|
if (procs[i].cpu_duration.tv_sec == 0 && procs[i].cpu_duration.tv_usec == 0) {
|
|
cpu = 0.;
|
|
} else {
|
|
cpu = (procs[i].last_request_cpu.tms_utime + procs[i].last_request_cpu.tms_stime + procs[i].last_request_cpu.tms_cutime + procs[i].last_request_cpu.tms_cstime) / fpm_scoreboard_get_tick() / (procs[i].cpu_duration.tv_sec + procs[i].cpu_duration.tv_usec / 1000000.) * 100.;
|
|
}
|
|
+#else
|
|
+ cpu = 0.;
|
|
+#endif
|
|
|
|
array_init(&fpm_proc_stat);
|
|
add_assoc_long(&fpm_proc_stat, "pid", procs[i].pid);
|
|
@@ -590,11 +594,15 @@
|
|
}
|
|
|
|
/* prevent NaN */
|
|
+#ifdef HAVE_TIMES
|
|
if (proc->cpu_duration.tv_sec == 0 && proc->cpu_duration.tv_usec == 0) {
|
|
cpu = 0.;
|
|
} else {
|
|
cpu = (proc->last_request_cpu.tms_utime + proc->last_request_cpu.tms_stime + proc->last_request_cpu.tms_cutime + proc->last_request_cpu.tms_cstime) / fpm_scoreboard_get_tick() / (proc->cpu_duration.tv_sec + proc->cpu_duration.tv_usec / 1000000.) * 100.;
|
|
}
|
|
+#else
|
|
+ cpu = 0.;
|
|
+#endif
|
|
|
|
if (proc->request_stage == FPM_REQUEST_ACCEPTING) {
|
|
duration = proc->duration;
|