Fix another batch of comments

kocsismate · kocsismate · commit 20d941da5294 · 2020-09-15T11:50:49.000+02:00
diff --git a/ext/standard/file.c b/ext/standard/file.c
@@ -958,7 +958,7 @@ PHP_FUNCTION(popen)
 	if (!fp) {
 		php_error_docref2(NULL, command, posix_mode, E_WARNING, "%s", strerror(errno));
 		efree(posix_mode);
-		RETURN_THROWS();
+		RETURN_FALSE;
 	}
 
 	stream = php_stream_fopen_from_pipe(fp, mode);
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
@@ -155,7 +155,7 @@ PHPAPI zend_string *php_mail_build_headers(HashTable *headers)
 	ZEND_HASH_FOREACH_KEY_VAL(headers, idx, key, val) {
 		if (!key) {
 			zend_type_error("Header name cannot be numeric, " ZEND_LONG_FMT " given", idx);
-			continue;
+			break;
 		}
 		/* https://tools.ietf.org/html/rfc2822#section-3.6 */
 		switch(ZSTR_LEN(key)) {
diff --git a/ext/standard/php_mail.h b/ext/standard/php_mail.h
@@ -29,7 +29,7 @@ do { \
 	} else if (Z_TYPE_P(val) == IS_ARRAY) { \
 		if (!strncasecmp(target, ZSTR_VAL(key), ZSTR_LEN(key))) { \
 			zend_type_error("Header \"%s\" must be of type string, array given", target); \
-			continue; \
+			break; \
 		} \
 		php_mail_build_headers_elems(&s, key, val); \
 	} else { \
diff --git a/ext/standard/tests/file/glob_error_002-win32.phpt b/ext/standard/tests/file/glob_error_002-win32.phpt
@@ -19,7 +19,7 @@ try {
 
 echo "Done";
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing glob() : error condition - pattern too long. ***
-glob(): Argument #1 ($pattern) must have a length less than 2048 bytes
+glob(): Argument #1 ($pattern) must have a length less than %d bytes
 Done
diff --git a/ext/standard/tests/file/popen_pclose_basic2.phpt b/ext/standard/tests/file/popen_pclose_basic2.phpt
diff --git a/ext/standard/tests/file/popen_pclose_error-win32.phpt b/ext/standard/tests/file/popen_pclose_error-win32.phpt

Original file line number	Diff line number	Diff line change
`@@ -958,7 +958,7 @@ PHP_FUNCTION(popen)`
`958`	`958`	`if (!fp) {`
`959`	`959`	`php_error_docref2(NULL, command, posix_mode, E_WARNING, "%s", strerror(errno));`
`960`	`960`	`efree(posix_mode);`
`961`		`- RETURN_THROWS();`
	`961`	`+ RETURN_FALSE;`
`962`	`962`	`}`
`963`	`963`
`964`	`964`	`stream = php_stream_fopen_from_pipe(fp, mode);`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ PHPAPI zend_string php_mail_build_headers(HashTable headers)`
`155`	`155`	`ZEND_HASH_FOREACH_KEY_VAL(headers, idx, key, val) {`
`156`	`156`	`if (!key) {`
`157`	`157`	`zend_type_error("Header name cannot be numeric, " ZEND_LONG_FMT " given", idx);`
`158`		`- continue;`
	`158`	`+ break;`
`159`	`159`	`}`
`160`	`160`	`/* https://tools.ietf.org/html/rfc2822#section-3.6 */`
`161`	`161`	`switch(ZSTR_LEN(key)) {`