diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-06-03 09:39:45 +0000 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-06-03 09:39:45 +0000 |
| commit | 479a47d8af09175abd9e241f54d16a8652a70b3b (patch) | |
| tree | 2da753e131b7435668facf171b1b9fe0405b3466 | |
| parent | 7af15a41d9a3725e3a3089fa0839d2458b59f398 (diff) | |
| download | php-git-479a47d8af09175abd9e241f54d16a8652a70b3b.tar.gz | |
Merge of fix for bug #54918 (r311745, scottmac) to 5.3.
| -rw-r--r-- | ext/standard/browscap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 19cf315b1c..a81bd86c0e 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -334,18 +334,18 @@ PHP_MINIT_FUNCTION(browscap) /* {{{ */ { char *browscap = INI_STR("browscap"); - if (browscap && browscap[0]) { - if (browscap_read_file(browscap, &global_bdata, 1 TSRMLS_CC) == FAILURE) { - return FAILURE; - } - } - #ifdef ZTS ts_allocate_id(&browscap_globals_id, sizeof(browser_data), (ts_allocate_ctor)browscap_globals_ctor, NULL); #endif /* ctor call not really needed for non-ZTS */ + if (browscap && browscap[0]) { + if (browscap_read_file(browscap, &global_bdata, 1 TSRMLS_CC) == FAILURE) { + return FAILURE; + } + } + return SUCCESS; } /* }}} */ |