Skip to content

Commit fb6d497

Browse files
crazywhalecccrazywhalecc
committed
Fix cli checks caused php testing fail
1 parent 73851c1 commit fb6d497

4 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎patches/cli_checks_81.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ index 8f05686367..c155028233 100644
2020
REGISTER_INI_ENTRIES();
2121

2222
- FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0;
23-
+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 1;
23+
+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 0;
2424

2525
zend_ffi_exception_ce = register_class_FFI_Exception(zend_ce_error);
2626

@@ -103,7 +103,7 @@ index 4287045511..eab0311d07 100644
103103
return NULL;
104104
}
105105
- if (!strcmp(sapi_module.name, "cli")) {
106-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
106+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
107107
static int cli_in = 0;
108108
fd = STDIN_FILENO;
109109
if (cli_in) {
@@ -112,7 +112,7 @@ index 4287045511..eab0311d07 100644
112112
#endif
113113
} else if (!strcasecmp(path, "stdout")) {
114114
- if (!strcmp(sapi_module.name, "cli")) {
115-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
115+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
116116
static int cli_out = 0;
117117
fd = STDOUT_FILENO;
118118
if (cli_out++) {
@@ -121,7 +121,7 @@ index 4287045511..eab0311d07 100644
121121
#endif
122122
} else if (!strcasecmp(path, "stderr")) {
123123
- if (!strcmp(sapi_module.name, "cli")) {
124-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
124+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
125125
static int cli_err = 0;
126126
fd = STDERR_FILENO;
127127
if (cli_err++) {
@@ -130,7 +130,7 @@ index 4287045511..eab0311d07 100644
130130
int dtablesize;
131131

132132
- if (strcmp(sapi_module.name, "cli")) {
133-
+ if (strcmp(sapi_module.name, "cli") || strcmp(sapi_module.name, "micro")) {
133+
+ if (strcmp(sapi_module.name, "cli") && strcmp(sapi_module.name, "micro")) {
134134
if (options & REPORT_ERRORS) {
135135
php_error_docref(NULL, E_WARNING, "Direct access to file descriptors is only available from command-line PHP");
136136
}

‎patches/cli_checks_83.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ index bbfe07576e..398373d577 100644
2020
REGISTER_INI_ENTRIES();
2121

2222
- FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0;
23-
+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 1;
23+
+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 0;
2424

2525
zend_ffi_exception_ce = register_class_FFI_Exception(zend_ce_error);
2626

@@ -112,7 +112,7 @@ index 8926485025..6740163bc5 100644
112112
return NULL;
113113
}
114114
- if (!strcmp(sapi_module.name, "cli")) {
115-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
115+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
116116
static int cli_in = 0;
117117
fd = STDIN_FILENO;
118118
if (cli_in) {
@@ -121,7 +121,7 @@ index 8926485025..6740163bc5 100644
121121
#endif
122122
} else if (!strcasecmp(path, "stdout")) {
123123
- if (!strcmp(sapi_module.name, "cli")) {
124-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
124+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
125125
static int cli_out = 0;
126126
fd = STDOUT_FILENO;
127127
if (cli_out++) {
@@ -130,7 +130,7 @@ index 8926485025..6740163bc5 100644
130130
#endif
131131
} else if (!strcasecmp(path, "stderr")) {
132132
- if (!strcmp(sapi_module.name, "cli")) {
133-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
133+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
134134
static int cli_err = 0;
135135
fd = STDERR_FILENO;
136136
if (cli_err++) {
@@ -139,7 +139,7 @@ index 8926485025..6740163bc5 100644
139139
int dtablesize;
140140

141141
- if (strcmp(sapi_module.name, "cli")) {
142-
+ if (strcmp(sapi_module.name, "cli") || strcmp(sapi_module.name, "micro")) {
142+
+ if (strcmp(sapi_module.name, "cli") && strcmp(sapi_module.name, "micro")) {
143143
if (options & REPORT_ERRORS) {
144144
php_error_docref(NULL, E_WARNING, "Direct access to file descriptors is only available from command-line PHP");
145145
}

‎patches/cli_checks_84.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ index d797f5f93f..27cb05e3e4 100644
2020
REGISTER_INI_ENTRIES();
2121

2222
- FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0;
23-
+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 1;
23+
+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 0;
2424

2525
zend_ffi_exception_ce = register_class_FFI_Exception(zend_ce_error);
2626

@@ -111,7 +111,7 @@ index a5581d9ccc..98455f7b52 100644
111111
return NULL;
112112
}
113113
- if (!strcmp(sapi_module.name, "cli")) {
114-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
114+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
115115
static int cli_in = 0;
116116
fd = STDIN_FILENO;
117117
if (cli_in) {
@@ -120,7 +120,7 @@ index a5581d9ccc..98455f7b52 100644
120120
#endif
121121
} else if (!strcasecmp(path, "stdout")) {
122122
- if (!strcmp(sapi_module.name, "cli")) {
123-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
123+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
124124
static int cli_out = 0;
125125
fd = STDOUT_FILENO;
126126
if (cli_out++) {
@@ -129,7 +129,7 @@ index a5581d9ccc..98455f7b52 100644
129129
#endif
130130
} else if (!strcasecmp(path, "stderr")) {
131131
- if (!strcmp(sapi_module.name, "cli")) {
132-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
132+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
133133
static int cli_err = 0;
134134
fd = STDERR_FILENO;
135135
if (cli_err++) {
@@ -138,7 +138,7 @@ index a5581d9ccc..98455f7b52 100644
138138
int dtablesize;
139139

140140
- if (strcmp(sapi_module.name, "cli")) {
141-
+ if (strcmp(sapi_module.name, "cli") || strcmp(sapi_module.name, "micro")) {
141+
+ if (strcmp(sapi_module.name, "cli") && strcmp(sapi_module.name, "micro")) {
142142
if (options & REPORT_ERRORS) {
143143
php_error_docref(NULL, E_WARNING, "Direct access to file descriptors is only available from command-line PHP");
144144
}

‎patches/cli_checks_85.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ index 10fc11f5..eb4d4175 100644
2020
REGISTER_INI_ENTRIES();
2121

2222
- FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0;
23-
+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 1;
23+
+ FFI_G(is_cli) = strcmp(sapi_module.name, "cli") == 0 || strcmp(sapi_module.name, "micro") == 0;
2424

2525
zend_ffi_exception_ce = register_class_FFI_Exception(zend_ce_error);
2626

@@ -98,7 +98,7 @@ index ea33ba49..083184b8 100644
9898
return NULL;
9999
}
100100
- if (!strcmp(sapi_module.name, "cli")) {
101-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
101+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
102102
static int cli_in = 0;
103103
fd = STDIN_FILENO;
104104
if (cli_in) {
@@ -107,7 +107,7 @@ index ea33ba49..083184b8 100644
107107
#endif
108108
} else if (!strcasecmp(path, "stdout")) {
109109
- if (!strcmp(sapi_module.name, "cli")) {
110-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
110+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
111111
static int cli_out = 0;
112112
fd = STDOUT_FILENO;
113113
if (cli_out++) {
@@ -116,7 +116,7 @@ index ea33ba49..083184b8 100644
116116
#endif
117117
} else if (!strcasecmp(path, "stderr")) {
118118
- if (!strcmp(sapi_module.name, "cli")) {
119-
+ if (!strcmp(sapi_module.name, "cli") && !strcmp(sapi_module.name, "micro")) {
119+
+ if (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "micro")) {
120120
static int cli_err = 0;
121121
fd = STDERR_FILENO;
122122
if (cli_err++) {
@@ -125,7 +125,7 @@ index ea33ba49..083184b8 100644
125125
int dtablesize;
126126

127127
- if (strcmp(sapi_module.name, "cli")) {
128-
+ if (strcmp(sapi_module.name, "cli") || strcmp(sapi_module.name, "micro")) {
128+
+ if (strcmp(sapi_module.name, "cli") && strcmp(sapi_module.name, "micro")) {
129129
if (options & REPORT_ERRORS) {
130130
php_error_docref(NULL, E_WARNING, "Direct access to file descriptors is only available from command-line PHP");
131131
}

0 commit comments

Comments
 (0)