diff --git a/src/globals/patch/php-src-patches/cli_checks_81.patch b/src/globals/patch/php-src-patches/cli_checks_81.patch index 92d6cce5..39ed5828 100644 --- a/src/globals/patch/php-src-patches/cli_checks_81.patch +++ b/src/globals/patch/php-src-patches/cli_checks_81.patch @@ -20,7 +20,7 @@ index 8f05686367..c155028233 100644 REGISTER_INI_ENTRIES(); - FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0; -+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 1; ++ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 0; zend_ffi_exception_ce = register_class_FFI_Exception(zend_ce_error); @@ -103,7 +103,7 @@ index 4287045511..eab0311d07 100644 return NULL; } - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_in = 0; fd = STDIN_FILENO; if (cli_in) { @@ -112,7 +112,7 @@ index 4287045511..eab0311d07 100644 #endif } else if (!strcasecmp(path, "stdout")) { - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_out = 0; fd = STDOUT_FILENO; if (cli_out++) { @@ -121,7 +121,7 @@ index 4287045511..eab0311d07 100644 #endif } else if (!strcasecmp(path, "stderr")) { - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_err = 0; fd = STDERR_FILENO; if (cli_err++) { @@ -130,7 +130,7 @@ index 4287045511..eab0311d07 100644 int dtablesize; - if (strcmp(sapi_module.name, "cli")) { -+ if (strcmp(sapi_module.name, "cli") || strcmp(sapi_module.name, "micro")) { ++ if (strcmp(sapi_module.name, "cli") && strcmp(sapi_module.name, "micro")) { if (options & REPORT_ERRORS) { php_error_docref(NULL, E_WARNING, "Direct access to file descriptors is only available from command-line PHP"); } diff --git a/src/globals/patch/php-src-patches/cli_checks_83.patch b/src/globals/patch/php-src-patches/cli_checks_83.patch index e9425095..db02843b 100644 --- a/src/globals/patch/php-src-patches/cli_checks_83.patch +++ b/src/globals/patch/php-src-patches/cli_checks_83.patch @@ -20,7 +20,7 @@ index bbfe07576e..398373d577 100644 REGISTER_INI_ENTRIES(); - FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0; -+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 1; ++ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 0; zend_ffi_exception_ce = register_class_FFI_Exception(zend_ce_error); @@ -112,7 +112,7 @@ index 8926485025..6740163bc5 100644 return NULL; } - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_in = 0; fd = STDIN_FILENO; if (cli_in) { @@ -121,7 +121,7 @@ index 8926485025..6740163bc5 100644 #endif } else if (!strcasecmp(path, "stdout")) { - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_out = 0; fd = STDOUT_FILENO; if (cli_out++) { @@ -130,7 +130,7 @@ index 8926485025..6740163bc5 100644 #endif } else if (!strcasecmp(path, "stderr")) { - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_err = 0; fd = STDERR_FILENO; if (cli_err++) { @@ -139,7 +139,7 @@ index 8926485025..6740163bc5 100644 int dtablesize; - if (strcmp(sapi_module.name, "cli")) { -+ if (strcmp(sapi_module.name, "cli") || strcmp(sapi_module.name, "micro")) { ++ if (strcmp(sapi_module.name, "cli") && strcmp(sapi_module.name, "micro")) { if (options & REPORT_ERRORS) { php_error_docref(NULL, E_WARNING, "Direct access to file descriptors is only available from command-line PHP"); } diff --git a/src/globals/patch/php-src-patches/cli_checks_84.patch b/src/globals/patch/php-src-patches/cli_checks_84.patch index 6b8ac74e..b137c6ef 100644 --- a/src/globals/patch/php-src-patches/cli_checks_84.patch +++ b/src/globals/patch/php-src-patches/cli_checks_84.patch @@ -20,7 +20,7 @@ index d797f5f93f..27cb05e3e4 100644 REGISTER_INI_ENTRIES(); - FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0; -+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 1; ++ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 0; zend_ffi_exception_ce = register_class_FFI_Exception(zend_ce_error); @@ -111,7 +111,7 @@ index a5581d9ccc..98455f7b52 100644 return NULL; } - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_in = 0; fd = STDIN_FILENO; if (cli_in) { @@ -120,7 +120,7 @@ index a5581d9ccc..98455f7b52 100644 #endif } else if (!strcasecmp(path, "stdout")) { - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_out = 0; fd = STDOUT_FILENO; if (cli_out++) { @@ -129,7 +129,7 @@ index a5581d9ccc..98455f7b52 100644 #endif } else if (!strcasecmp(path, "stderr")) { - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_err = 0; fd = STDERR_FILENO; if (cli_err++) { @@ -138,7 +138,7 @@ index a5581d9ccc..98455f7b52 100644 int dtablesize; - if (strcmp(sapi_module.name, "cli")) { -+ if (strcmp(sapi_module.name, "cli") || strcmp(sapi_module.name, "micro")) { ++ if (strcmp(sapi_module.name, "cli") && strcmp(sapi_module.name, "micro")) { if (options & REPORT_ERRORS) { php_error_docref(NULL, E_WARNING, "Direct access to file descriptors is only available from command-line PHP"); } diff --git a/src/globals/patch/php-src-patches/cli_checks_85.patch b/src/globals/patch/php-src-patches/cli_checks_85.patch index cfd72550..b8cf0fa5 100644 --- a/src/globals/patch/php-src-patches/cli_checks_85.patch +++ b/src/globals/patch/php-src-patches/cli_checks_85.patch @@ -20,7 +20,7 @@ index 10fc11f5..eb4d4175 100644 REGISTER_INI_ENTRIES(); - FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0; -+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 1; ++ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 0; zend_ffi_exception_ce = register_class_FFI_Exception(zend_ce_error); @@ -98,7 +98,7 @@ index ea33ba49..083184b8 100644 return NULL; } - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_in = 0; fd = STDIN_FILENO; if (cli_in) { @@ -107,7 +107,7 @@ index ea33ba49..083184b8 100644 #endif } else if (!strcasecmp(path, "stdout")) { - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_out = 0; fd = STDOUT_FILENO; if (cli_out++) { @@ -116,7 +116,7 @@ index ea33ba49..083184b8 100644 #endif } else if (!strcasecmp(path, "stderr")) { - if (!strcmp(sapi_module.name, "cli")) { -+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) { ++ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) { static int cli_err = 0; fd = STDERR_FILENO; if (cli_err++) { @@ -125,7 +125,7 @@ index ea33ba49..083184b8 100644 int dtablesize; - if (strcmp(sapi_module.name, "cli")) { -+ if (strcmp(sapi_module.name, "cli") || strcmp(sapi_module.name, "micro")) { ++ if (strcmp(sapi_module.name, "cli") && strcmp(sapi_module.name, "micro")) { if (options & REPORT_ERRORS) { php_error_docref(NULL, E_WARNING, "Direct access to file descriptors is only available from command-line PHP"); }