Re: 4.2.3

At 15:36 8/22/2002 +0300, Zeev Suraski wrote:

As per Dan K, most of the important bug fixes were backported to the 4.2 branch (thanks everyone!) I'll pack 4.2.3RC1 tomorrow morning, so if anybody has any last minute bug fixes to put in, now's the time!

Testkit issues and introduction of a simpler method to skip, rather than each his own, when it can actually be generically done. New file: tests/globfuncs.inc =================================================================== <?php function ext_skip_if($ext) {

        if(!extension_loaded($ext)&& ini_get("enable_dl")) {
                $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
                @dl("$ext$dlext");
        }
        if (!extension_loaded("$ext")) {
                die("skip\n");
        }

} function func_skip_if($funcname) {

        if(!function_exists($funcname))
        {
                die("skip\n");
        }

} ?> Patch for aggregation tests: Index: ext/standard/tests/aggregation/aggregate.phpt =================================================================== RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate.phpt,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 aggregate.phpt

--- ext/standard/tests/aggregation/aggregate.phpt       29 Mar 2002 15:15:16 -0000      1.2.2.1
+++ ext/standard/tests/aggregation/aggregate.phpt       22 Aug 2002 17:21:53 -0000

@@ -2,6 +2,11 @@ aggregating everything --POST-- --GET-- +--SKIPIF-- +<?php +include("./tests/globfuncs.inc"); +func_skip_if('aggregate'); +?> --FILE-- <?php include "./ext/standard/tests/aggregation/aggregate.lib"; Index: ext/standard/tests/aggregation/aggregate_methods.phpt =================================================================== RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_methods.phpt,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 aggregate_methods.phpt

--- ext/standard/tests/aggregation/aggregate_methods.phpt       29 Mar 2002 15:15:16 -0000      1.2.2.1
+++ ext/standard/tests/aggregation/aggregate_methods.phpt       22 Aug 2002 17:21:53 -0000

@@ -2,6 +2,11 @@ aggregating all methods --POST-- --GET-- +--SKIPIF-- +<?php +include("./tests/globfuncs.inc"); +func_skip_if('aggregate'); +?> --FILE-- <?php include "./ext/standard/tests/aggregation/aggregate.lib"; Index: ext/standard/tests/aggregation/aggregate_methods_by_list.phpt =================================================================== RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 aggregate_methods_by_list.phpt

--- ext/standard/tests/aggregation/aggregate_methods_by_list.phpt       29 Mar 2002 15:15:16 -0000      1.2.2.1
+++ ext/standard/tests/aggregation/aggregate_methods_by_list.phpt       22 Aug 2002 17:21:53 -0000

@@ -2,6 +2,11 @@ aggregating methods specified in the list --POST-- --GET-- +--SKIPIF-- +<?php +include("./tests/globfuncs.inc"); +func_skip_if('aggregate'); +?> --FILE-- <?php include "./ext/standard/tests/aggregation/aggregate.lib"; Index: ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt =================================================================== RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 aggregate_methods_by_regexp.phpt

--- ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt     29 Mar 2002 15:15:16 -0000      1.2.2.1
+++ ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt     22 Aug 2002 17:21:53 -0000

@@ -2,6 +2,11 @@ aggregating methods matching regular expression --POST-- --GET-- +--SKIPIF-- +<?php +include("./tests/globfuncs.inc"); +func_skip_if('aggregate'); +?> --FILE-- <?php include "./ext/standard/tests/aggregation/aggregate.lib"; Index: ext/standard/tests/aggregation/aggregate_properties.phpt =================================================================== RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_properties.phpt,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 aggregate_properties.phpt

--- ext/standard/tests/aggregation/aggregate_properties.phpt    29 Mar 2002 15:15:16 -0000      1.2.2.1
+++ ext/standard/tests/aggregation/aggregate_properties.phpt    22 Aug 2002 17:21:53 -0000

@@ -2,6 +2,11 @@ aggregating all default properties --POST-- --GET-- +--SKIPIF-- +<?php +include("./tests/globfuncs.inc"); +func_skip_if('aggregate'); +?> --FILE-- <?php include "./ext/standard/tests/aggregation/aggregate.lib"; Index: ext/standard/tests/aggregation/aggregate_properties_by_list.phpt =================================================================== RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 aggregate_properties_by_list.phpt

--- ext/standard/tests/aggregation/aggregate_properties_by_list.phpt    29 Mar 2002 15:15:16 -0000      1.2.2.1
+++ ext/standard/tests/aggregation/aggregate_properties_by_list.phpt    22 Aug 2002 17:21:53 -0000

@@ -2,6 +2,11 @@ aggregating default properties specified in the list --POST-- --GET-- +--SKIPIF-- +<?php +include("./tests/globfuncs.inc"); +func_skip_if('aggregate'); +?> --FILE-- <?php include "./ext/standard/tests/aggregation/aggregate.lib"; Index: ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt =================================================================== RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 aggregate_properties_by_regexp.phpt --- ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt 29

Mar 2002 15:15:16 -0000      1.2.2.1
+++ ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt  22 Aug 2002 17:21:53 -0000

@@ -2,6 +2,11 @@ aggregating default properties matching regular expression --POST-- --GET-- +--SKIPIF-- +<?php +include("./tests/globfuncs.inc"); +func_skip_if('aggregate'); +?> --FILE-- <?php include "./ext/standard/tests/aggregation/aggregate.lib"; Index: ext/standard/tests/aggregation/aggregation_info.phpt =================================================================== RCS file: /repository/php4/ext/standard/tests/aggregation/aggregation_info.phpt,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 aggregation_info.phpt

--- ext/standard/tests/aggregation/aggregation_info.phpt        29 Mar 2002 15:15:16 -0000      1.2.2.1
+++ ext/standard/tests/aggregation/aggregation_info.phpt        22 Aug 2002 17:21:53 -0000

@@ -2,6 +2,11 @@ retrieving aggregation info --POST-- --GET-- +--SKIPIF-- +<?php +include("./tests/globfuncs.inc"); +func_skip_if('aggregate'); +?> --FILE-- <?php include "./ext/standard/tests/aggregation/aggregate.lib"; Index: ext/standard/tests/aggregation/deaggregate.phpt =================================================================== RCS file: /repository/php4/ext/standard/tests/aggregation/deaggregate.phpt,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 deaggregate.phpt

--- ext/standard/tests/aggregation/deaggregate.phpt     29 Mar 2002 15:15:16 -0000      1.2.2.1
+++ ext/standard/tests/aggregation/deaggregate.phpt     22 Aug 2002 17:21:53 -0000

@@ -2,6 +2,11 @@ deaggreating --POST-- --GET-- +--SKIPIF-- +<?php +include("./tests/globfuncs.inc"); +func_skip_if('aggregate'); +?> --FILE-- <?php include "./ext/standard/tests/aggregation/aggregate.lib"; Met vriendelijke groeten / With kind regards, Webmaster IDG.nl Melvyn Sopacua <@Logan> I spent a minute looking at my own code by accident. <@Logan> I was thinking "What the hell is this guy doing?"