From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Fri, 3 Jun 2011 09:39:45 +0000 (+0000)
Subject: Merge of fix for bug #54918 (r311745, scottmac) to 5.3.
X-Git-Tag: php-5.3.7RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=479a47d8af09175abd9e241f54d16a8652a70b3b;p=php

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

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;
 }
 /* }}} */