Skip to content

Commit 64bb3ef

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix GH-10052: Browscap crashes PHP 8.1.12 on request shutdown (apache2)
2 parents 3032a68 + c407243 commit 64bb3ef

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ PHP NEWS
5959

6060
- Standard:
6161
. Fixed bug GH-10885 (stream_socket_server context leaks). (ilutov)
62+
. Fixed bug GH-10052 (Browscap crashes PHP 8.1.12 on request shutdown
63+
(apache2)). (nielsdos)
6264

6365
16 Mar 2023, PHP 8.2.4
6466

ext/standard/browscap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ static int browscap_read_file(char *filename, browser_data *browdata, int persis
432432
ctx.current_section_name = NULL;
433433
zend_hash_init(&ctx.str_interned, 8, NULL, str_interned_dtor, persistent);
434434

435-
zend_parse_ini_file(&fh, 1, ZEND_INI_SCANNER_RAW,
435+
zend_parse_ini_file(&fh, persistent, ZEND_INI_SCANNER_RAW,
436436
(zend_ini_parser_cb_t) php_browscap_parser_cb, &ctx);
437437

438438
/* Destroy parser context */

0 commit comments

Comments
 (0)