Fix

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index eae25b6c2b9646cbe68daca2441febe7a024e78a..d04989ed6cc9443ce62ee5d1448db321afbb0e70 100644 (file)
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -121,7 +121,7 @@ PHP_FUNCTION(get_browser)
                if (_php3_hash_find(&browser_hash, agent_name->value.str.val, agent_name->value.str.len+1, (void **) &agent)==FAILURE) {
                        break;
                }
-               _php3_hash_merge(return_value->value.ht,agent->value.ht,(void (*)(void *pData)) pval_copy_constructor, (void *) &tmp, sizeof(pval));
+               _php3_hash_merge(return_value->value.ht,agent->value.ht,(void (*)(void *pData)) pval_copy_constructor, (void *) &tmp, sizeof(pval), 0);
        }
 }
 

diff --git a/testobj b/testobj
index 26ca69bf005b5138f6eb510c931c9149bf51b58e..1c2aa7f2c0f84aac5914327c8b824628e38bd4b8 100644 (file)
--- a/testobj
+++ b/testobj
@@ -7,8 +7,8 @@ class foobar {
        }
 };
 
-//$foo = new foobar or die("Unable to construct foobar\n");
-$word = new COm("word.application");
-$word->visible = true;
-sleep(5);
-$word->quit();
+$foo = new foobar; // or die("Unable to construct foobar\n");
+//$word = new COm("word.application");
+//$word->visible = true;
+//sleep(5);
+//$word->quit();