Skip to content

Commit ddacfb2

Browse files
committed
Make error less confusing
1 parent 88cf76e commit ddacfb2

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

ext/standard/http_fopen_wrapper.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,13 @@ static bool php_stream_unwrap_content(php_stream_context *context, zend_string *
360360
*str_out = Z_STR_P(content);
361361
return true;
362362
} else if (Z_TYPE_P(content) == IS_RESOURCE) {
363-
if ((php_stream_from_zval_no_verify(*stream_out, content))) {
363+
*stream_out = php_stream_from_zval_no_verify_no_error(content);
364+
if (*stream_out) {
364365
return true;
366+
} else {
367+
const char *space;
368+
const char *class_name = get_active_class_name(&space);
369+
zend_type_error("%s%s%s(): \"content\" resource is not a valid stream resource", class_name, space, get_active_function_name());
365370
}
366371
}
367372
}

ext/standard/tests/http/gh19249_no_stream.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ foreach ($headers as $header) {
3737
proc_close($postData);
3838
?>
3939
--EXPECT--
40-
file_get_contents(): supplied resource is not a valid stream resource
41-
file_get_contents(): supplied resource is not a valid stream resource
40+
file_get_contents(): "content" resource is not a valid stream resource
41+
file_get_contents(): "content" resource is not a valid stream resource

0 commit comments

Comments
 (0)