Merge of fix for bug #54918 (r311745, scottmac) to 5.3.

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 19cf315b1cdd16dc83c6a0dc609e4564d6b48c80..a81bd86c0effb9ea6518ddb18cb686b0394a01d5 100644 (file)
--- 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;
 }
 /* }}} */