Fix ZTS-ZE2 (After Cygwin now for the rest)

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 9a629b5ff5dc945ff097b10e654e0d18883b005b..2f9e97d5857031d1680b3713ba2ffc8d77b5dc61 100644 (file)
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -189,13 +189,13 @@ PHP_MSHUTDOWN_FUNCTION(browscap)
  */
 static int browser_reg_compare(zval **browser, int num_args, va_list args, zend_hash_key *key)
 {
-       TSRMLS_FETCH();
-
        zval **browser_name;
        regex_t r;
        char *lookup_browser_name = va_arg(args, char *);
        zval **found_browser_entry = va_arg(args, zval **);
 
+       TSRMLS_FETCH();
+
        if (*found_browser_entry) { /* already found */
                return 0;
        }

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 9050143646abb0d862d0ed80199ffbb5d8c18c10..76fe93ddc1107a33f773fc58057a6e409fe8d32a 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -956,7 +956,7 @@ static void php_wddx_pop_element(void *user_data, const char *name)
                                                                                (void *) &tmp, sizeof(zval *), 0);
 
                                                if (incomplete_class) {
-                                                       php_store_class_name(obj, Z_STRVAL_P(ent1->data), Z_STRLEN_P(ent1->data), TSRMLS_CC);
+                                                       php_store_class_name(obj, Z_STRVAL_P(ent1->data), Z_STRLEN_P(ent1->data) TSRMLS_CC);
                                                }
 
                                                /* Clean up old array entry */