Skip to content

Commit 6d9d7af

Browse files
committed
- Fixed bug #54580 (get_browser() segmentation fault when the browscap ini
directive is set in activation time). This commit fixes this by adding a per request parsing of the browscap file that's when get_browser is called the first time and the directive is set on activation time.w
1 parent 8dfe15a commit 6d9d7af

File tree

4 files changed

+218
-67
lines changed

4 files changed

+218
-67
lines changed

ext/standard/basic_functions.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3769,6 +3769,7 @@ PHP_RSHUTDOWN_FUNCTION(basic) /* {{{ */
37693769
}
37703770

37713771
PHP_RSHUTDOWN(user_filters)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
3772+
PHP_RSHUTDOWN(browscap)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
37723773

37733774
BG(page_uid) = -1;
37743775
BG(page_gid) = -1;

ext/standard/basic_functions.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ PHP_FUNCTION(stream_bucket_append);
140140
PHP_FUNCTION(stream_bucket_new);
141141
PHP_MINIT_FUNCTION(user_filters);
142142
PHP_RSHUTDOWN_FUNCTION(user_filters);
143+
PHP_RSHUTDOWN_FUNCTION(browscap);
143144

144145
/* Left for BC (not binary safe!) */
145146
PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers TSRMLS_DC);

0 commit comments

Comments
 (0)