archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix GH-16883: gzopen() does not use the default stream context when opening HTTP URLs

Browse source 
Otherwise it's not possible to control the context; it's also consistent
with how the standard open functions work.

Closes GH-17589.
This commit is contained in:
Niels Dossche 2025-01-26 18:30:46 +01:00
parent a7df6a7759
commit f926c5ce81
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
4 changed files with 54 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -149,6 +149,8 @@ PHP NEWS
- Zlib:
. gzfile, gzopen and readgzfile, their "use_include_path" argument
is now a boolean. (David Carlier)
. Fixed bug GH-16883 (gzopen() does not use the default stream context when
opening HTTP URLs). (nielsdos)
<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

2
UPGRADING
View file

@ -166,6 +166,8 @@ PHP 8.5 UPGRADE NOTES
. The "use_include_path" argument for the
gzfile, gzopen and readgzfile functions had been changed
from int to boolean.
. gzfile, gzopen and readgzfile functions now respect the default
stream context.
========================================
6. New Functions

46
ext/zlib/tests/gh16883.phpt Normal file
View file

@ -0,0 +1,46 @@
--TEST--
GH-16883 (gzopen() does not use the default stream context when opening HTTP URLs)
--EXTENSIONS--
zlib
--INI--
allow_url_fopen=1
--SKIPIF--
<?php
if (!file_exists(__DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc")) {
echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
}
?>
--FILE--
<?php
require __DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc";
$code = <<<'PHP'
echo $_SERVER['HTTP_USER_AGENT'], "\n";
PHP;
php_cli_server_start($code);
stream_context_set_default([
'http' => array(
'user_agent' => 'dummy',
)
]);
$f = gzopen('http://'.PHP_CLI_SERVER_HOSTNAME.':'.PHP_CLI_SERVER_PORT, 'r');
var_dump(stream_get_contents($f));
var_dump(gzfile('http://'.PHP_CLI_SERVER_HOSTNAME.':'.PHP_CLI_SERVER_PORT, 'r'));
var_dump(readgzfile('http://'.PHP_CLI_SERVER_HOSTNAME.':'.PHP_CLI_SERVER_PORT, 'r'));
?>
--EXPECT--
string(6) "dummy
"
array(1) {
[0]=>
string(6) "dummy
"
}
dummy
int(6)

7
ext/zlib/zlib.c
View file

@ -26,6 +26,7 @@
#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "ext/standard/file.h"
#include "php_zlib.h"
#include "zlib_arginfo.h"
@ -621,7 +622,7 @@ PHP_FUNCTION(gzfile)
}
/* using a stream here is a bit more efficient (resource wise) than php_gzopen_wrapper */
stream = php_stream_gzopen(NULL, filename, "rb", flags, NULL, NULL STREAMS_CC);
stream = php_stream_gzopen(NULL, filename, "rb", flags, NULL, php_stream_context_from_zval(NULL, false) STREAMS_CC);
if (!stream) {
/* Error reporting is already done by stream code */
@ -659,7 +660,7 @@ PHP_FUNCTION(gzopen)
flags |= USE_PATH;
}
stream = php_stream_gzopen(NULL, filename, mode, flags, NULL, NULL STREAMS_CC);
stream = php_stream_gzopen(NULL, filename, mode, flags, NULL, php_stream_context_from_zval(NULL, false) STREAMS_CC);
if (!stream) {
RETURN_FALSE;
@ -686,7 +687,7 @@ PHP_FUNCTION(readgzfile)
flags |= USE_PATH;
}
stream = php_stream_gzopen(NULL, filename, "rb", flags, NULL, NULL STREAMS_CC);
stream = php_stream_gzopen(NULL, filename, "rb", flags, NULL, php_stream_context_from_zval(NULL, false) STREAMS_CC);
if (!stream) {
RETURN_FALSE;