]> granicus.if.org Git - php/log
php
6 years agoMake opcache zend_func_info consistent with Reflection for ctype
Tyson Andre [Sat, 15 Jun 2019 21:20:34 +0000 (17:20 -0400)]
Make opcache zend_func_info consistent with Reflection for ctype

This follows up with php 8.0 adding a real return type
(non-null bool) in 1409a3b1535e221d8449416d77ed45175f3335d2

6 years agoFix a typo in UPGRADING
Tyson Andre [Sat, 15 Jun 2019 20:44:02 +0000 (16:44 -0400)]
Fix a typo in UPGRADING

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Sun, 16 Jun 2019 06:29:41 +0000 (08:29 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  this mtime comparison makes assumptions that cannot always hold true

6 years agothis mtime comparison makes assumptions that cannot always hold true
Joe Watkins [Sun, 16 Jun 2019 06:29:04 +0000 (08:29 +0200)]
this mtime comparison makes assumptions that cannot always hold true

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Sun, 16 Jun 2019 05:18:17 +0000 (07:18 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  gettimeofday cannot be used to reliably implement high precision process synchronization

6 years agogettimeofday cannot be used to reliably implement high precision process synchronization
Joe Watkins [Sun, 16 Jun 2019 05:02:28 +0000 (07:02 +0200)]
gettimeofday cannot be used to reliably implement high precision process synchronization

The use of gettimeofday in time_sleep_until is technically incorrect, it's not possible
to use gettimeofday in this way reliably on any platform: It relies on operating system
global structures, which may be modified by any other process on the system at any time.

While in practice, users may be ignoring this flaw, it entirely depends on the other software
running on the system to which the application is deployed, there is no possible way to write
a test that will always pass on any system, therefore it must be marked XFAIL.

6 years agoSet correct default version
Anatol Belski [Sat, 15 Jun 2019 15:42:04 +0000 (17:42 +0200)]
Set correct default version

6 years agoMerge branch 'PHP-7.4'
Anatol Belski [Sat, 15 Jun 2019 15:39:44 +0000 (17:39 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Set correct default version

6 years agoSet correct default version
Anatol Belski [Sat, 15 Jun 2019 15:39:13 +0000 (17:39 +0200)]
Set correct default version

6 years agoPHP-8.0 should run JIT tests, always [ci skip]
Joe Watkins [Sat, 15 Jun 2019 08:08:48 +0000 (10:08 +0200)]
PHP-8.0 should run JIT tests, always [ci skip]

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Sat, 15 Jun 2019 08:07:15 +0000 (10:07 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  PHP-7.4 branch should not run JIT tests, ever [ci skip]

6 years agoPHP-7.4 branch should not run JIT tests, ever [ci skip]
Joe Watkins [Sat, 15 Jun 2019 08:06:51 +0000 (10:06 +0200)]
PHP-7.4 branch should not run JIT tests, ever [ci skip]

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Sat, 15 Jun 2019 08:01:22 +0000 (10:01 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  This test is flaky, and some of it doesn't make sense.

6 years agoThis test is flaky, and some of it doesn't make sense.
Joe Watkins [Sat, 15 Jun 2019 07:57:51 +0000 (09:57 +0200)]
This test is flaky, and some of it doesn't make sense.

I've refactored based on the original bug report, related bugs, and commits
to php-src that were related to them.

It is supposed to be testing windows specific behaviour related to non-blocking pipes,
nevertheless the test runs everywhere.

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Sat, 15 Jun 2019 06:39:50 +0000 (08:39 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove dead code in sockets extension [ci skip]

6 years agoRemove dead code in sockets extension [ci skip]
George Peter Banyard [Fri, 14 Jun 2019 17:01:02 +0000 (19:01 +0200)]
Remove dead code in sockets extension [ci skip]

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Sat, 15 Jun 2019 06:09:17 +0000 (08:09 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  fix flaky socket tests

6 years agofix flaky socket tests
Joe Watkins [Sat, 15 Jun 2019 06:08:08 +0000 (08:08 +0200)]
fix flaky socket tests

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 15:09:21 +0000 (17:09 +0200)]
Merge branch 'PHP-7.4'

6 years agoRemove file/005_variation.phpt
Nikita Popov [Fri, 14 Jun 2019 15:06:47 +0000 (17:06 +0200)]
Remove file/005_variation.phpt

As this test doesn't check differences in times before and after
operations, it doesn't actually verify anything and just wastes
30 seconds of test time.

As we already have other tests that do check how stat times change,
I'm removing it entirely.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 14:56:42 +0000 (16:56 +0200)]
Merge branch 'PHP-7.4'

6 years agoMake curl_multi_info_read.phpt more robust
Nikita Popov [Fri, 14 Jun 2019 14:55:51 +0000 (16:55 +0200)]
Make curl_multi_info_read.phpt more robust

I don't think there's any need to make remote connections here
(and bugs.php.net is down right now...) so just use local files
instead.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 14:16:26 +0000 (16:16 +0200)]
Merge branch 'PHP-7.4'

6 years agoRemove useless param in php_snmp_error()
George Peter Banyard [Wed, 12 Jun 2019 19:27:49 +0000 (21:27 +0200)]
Remove useless param in php_snmp_error()

It is always NULL.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 13:38:27 +0000 (15:38 +0200)]
Merge branch 'PHP-7.4'

6 years agoFix compilation without deprecated OpenSSL 1.1 APIs
Rosen Penev [Sat, 27 Apr 2019 18:17:28 +0000 (11:17 -0700)]
Fix compilation without deprecated OpenSSL 1.1 APIs

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Fri, 14 Jun 2019 12:22:41 +0000 (14:22 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  disable this test temporarily

6 years agodisable this test temporarily
Joe Watkins [Fri, 14 Jun 2019 12:22:25 +0000 (14:22 +0200)]
disable this test temporarily

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 11:12:08 +0000 (13:12 +0200)]
Merge branch 'PHP-7.4'

6 years agoTurn add_index_zval and add_next_index_zval into inline function
twosee [Tue, 11 Jun 2019 14:07:32 +0000 (22:07 +0800)]
Turn add_index_zval and add_next_index_zval into inline function

Avoids expression warnings and allows explicitly namespaced use in
C++.

Closes GH-4250.

6 years agoenable JIT only in master for macosx
Joe Watkins [Fri, 14 Jun 2019 10:59:05 +0000 (12:59 +0200)]
enable JIT only in master for macosx

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Fri, 14 Jun 2019 10:57:47 +0000 (12:57 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  fix mac tests on azure

6 years agoMerge branch 'mac-tests' into PHP-7.4
Joe Watkins [Fri, 14 Jun 2019 10:56:08 +0000 (12:56 +0200)]
Merge branch 'mac-tests' into PHP-7.4

* mac-tests:
  fix mac tests on azure

6 years agofix mac tests on azure
Joe Watkins [Thu, 13 Jun 2019 09:28:46 +0000 (11:28 +0200)]
fix mac tests on azure

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 10:46:56 +0000 (12:46 +0200)]
Merge branch 'PHP-7.4'

6 years agoFix SNMP build warnings
Nikita Popov [Fri, 14 Jun 2019 10:44:54 +0000 (12:44 +0200)]
Fix SNMP build warnings

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 14 Jun 2019 10:29:50 +0000 (13:29 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Backport 96a12578c13b5c37195b10526fcdc669b795644d

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Fri, 14 Jun 2019 10:29:40 +0000 (13:29 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Backport 96a12578c13b5c37195b10526fcdc669b795644d

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Fri, 14 Jun 2019 10:29:30 +0000 (13:29 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Backport 96a12578c13b5c37195b10526fcdc669b795644d

6 years agoBackport 96a12578c13b5c37195b10526fcdc669b795644d
Dmitry Stogov [Fri, 14 Jun 2019 10:29:13 +0000 (13:29 +0300)]
Backport 96a12578c13b5c37195b10526fcdc669b795644d

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 14 Jun 2019 10:26:26 +0000 (13:26 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Backport 91a6cdbff5ebd1ca4db1d6e8c42d3265ce80ace4

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Fri, 14 Jun 2019 10:26:04 +0000 (13:26 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Backport 91a6cdbff5ebd1ca4db1d6e8c42d3265ce80ace4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Fri, 14 Jun 2019 10:25:06 +0000 (13:25 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Backport 91a6cdbff5ebd1ca4db1d6e8c42d3265ce80ace4

6 years agoBackport 91a6cdbff5ebd1ca4db1d6e8c42d3265ce80ace4
Dmitry Stogov [Fri, 14 Jun 2019 10:24:47 +0000 (13:24 +0300)]
Backport 91a6cdbff5ebd1ca4db1d6e8c42d3265ce80ace4

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 14 Jun 2019 10:10:39 +0000 (13:10 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  More edge case fixes that may cause bug #78106

6 years agoMore edge case fixes that may cause bug #78106
Dmitry Stogov [Fri, 14 Jun 2019 10:10:02 +0000 (13:10 +0300)]
More edge case fixes that may cause bug #78106

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 14 Jun 2019 09:48:00 +0000 (12:48 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Attempt to fix edge conditions that may cause bug #78106

6 years agoAttempt to fix edge conditions that may cause bug #78106
Dmitry Stogov [Fri, 14 Jun 2019 09:47:22 +0000 (12:47 +0300)]
Attempt to fix edge conditions that may cause bug #78106

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 09:37:41 +0000 (11:37 +0200)]
Merge branch 'PHP-7.4'

6 years agoImplement numeric literal separators
Theodore Brown [Thu, 2 May 2019 17:10:19 +0000 (12:10 -0500)]
Implement numeric literal separators

RFC: https://wiki.php.net/rfc/numeric_literal_separator

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 09:14:08 +0000 (11:14 +0200)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 14 Jun 2019 09:13:15 +0000 (11:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoFix some leaks in ldap
Nikita Popov [Fri, 14 Jun 2019 09:11:24 +0000 (11:11 +0200)]
Fix some leaks in ldap

The result of zval_get_string() needs to be released. In some places
where it is inconvenient to manage, I went back to convert_to_string.
It is safe in those places due to existing array separations.

Also fix a preexisting leak when getting controls, the previous
value was not destroyed.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 07:30:22 +0000 (09:30 +0200)]
Merge branch 'PHP-7.4'

6 years agoFix skipif syntax errors
Nikita Popov [Fri, 14 Jun 2019 07:29:14 +0000 (09:29 +0200)]
Fix skipif syntax errors

Apparently I did this only on masster...

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Fri, 14 Jun 2019 06:30:46 +0000 (08:30 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  disable phpdbg on i386 builds [ci skip]

6 years agodisable phpdbg on i386 builds [ci skip]
Joe Watkins [Fri, 14 Jun 2019 06:30:20 +0000 (08:30 +0200)]
disable phpdbg on i386 builds [ci skip]

6 years agoFixed incorect register allocation in ZTS build
Dmitry Stogov [Thu, 13 Jun 2019 21:29:22 +0000 (00:29 +0300)]
Fixed incorect register allocation in ZTS build

6 years agoThrow TypeError instead of warning in case of invalid path
Christoph M. Becker [Thu, 13 Jun 2019 15:05:47 +0000 (17:05 +0200)]
Throw TypeError instead of warning in case of invalid path

For consistency with imagegd(), imagegd2() and imagexbm(), which throw
a TypeError if a path containing NUL bytes is given, we throw a
TypeError for the other image writer functions as well.

6 years agoMerge branch 'PHP-7.4'
Côme Chilliet [Thu, 13 Jun 2019 20:15:41 +0000 (22:15 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Some more string conversion handling, fixing bug #77958
  Avoid converting zval when not needed

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Côme Chilliet [Thu, 13 Jun 2019 20:15:13 +0000 (22:15 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Some more string conversion handling, fixing bug #77958
  Avoid converting zval when not needed

6 years agoSome more string conversion handling, fixing bug #77958
Côme Chilliet [Thu, 13 Jun 2019 20:12:34 +0000 (22:12 +0200)]
Some more string conversion handling, fixing bug #77958

6 years agoAvoid converting zval when not needed
Côme Chilliet [Thu, 13 Jun 2019 18:58:45 +0000 (20:58 +0200)]
Avoid converting zval when not needed

Also added exception checks so that exception from __toString are
 correctly handled in the future

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 14:53:25 +0000 (16:53 +0200)]
Merge branch 'PHP-7.4'

6 years agoRevert "ext/standard: Use PKG_CHECK_MODULES to detect the Argon2 library"
Nikita Popov [Thu, 13 Jun 2019 14:50:57 +0000 (16:50 +0200)]
Revert "ext/standard: Use PKG_CHECK_MODULES to detect the Argon2 library"

This reverts commit bdcef51bcb367323f2eea4808f34a1b3e58bd3d8.

It seems that pkg-config support for libargon2 is still flaky:
 * No pc file on Alpine.
 * Custom builds of released libargon2 versions create a broken
   pc file. This is fixed in master, but not released.

Go back to the old detection code for now.

6 years agoRemove superfluous CLEAN sections
Christoph M. Becker [Thu, 13 Jun 2019 12:32:06 +0000 (14:32 +0200)]
Remove superfluous CLEAN sections

These actually should have been removed with commit be73ae3[1].

[1] <https://github.com/php/php-src/commit/be73ae31324f7f3294a9467c0646dba4324c78ef>

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 12:22:48 +0000 (14:22 +0200)]
Merge branch 'PHP-7.4'

6 years agoCondition some azure jobs on schedule trigger
Nikita Popov [Thu, 13 Jun 2019 12:20:47 +0000 (14:20 +0200)]
Condition some azure jobs on schedule trigger

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 13 Jun 2019 11:07:30 +0000 (13:07 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Add BMP support to PHP info

6 years agoAdd BMP support to PHP info
Christoph M. Becker [Thu, 13 Jun 2019 11:03:58 +0000 (13:03 +0200)]
Add BMP support to PHP info

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 10:54:17 +0000 (12:54 +0200)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 13 Jun 2019 10:54:10 +0000 (12:54 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 13 Jun 2019 10:52:22 +0000 (12:52 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFixed bug #78106
Nikita Popov [Thu, 13 Jun 2019 10:51:35 +0000 (12:51 +0200)]
Fixed bug #78106

When disabling opcache during the request via opcache.enable ini
setting, make sure we also disable ZCG(accelerator_enabled).

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 10:41:14 +0000 (12:41 +0200)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 13 Jun 2019 10:40:23 +0000 (12:40 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 13 Jun 2019 10:38:57 +0000 (12:38 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoAdd test for bug #78106
Nikita Popov [Thu, 13 Jun 2019 10:35:29 +0000 (12:35 +0200)]
Add test for bug #78106

Also add PHP_TEST_EXTRA_ARGS environment variable, which allows
to pass on -c, -d etc flags provided by run-tests.php. Otherwise
we won't get the built-in server to run with opcache.

6 years agoFix helper call on 32-bit
Nikita Popov [Thu, 13 Jun 2019 10:11:23 +0000 (12:11 +0200)]
Fix helper call on 32-bit

This is using the fast-call calling convention. Use FCARG1a and
same code for 32-bit and 64-bit.

6 years agoFix bug #78154 with JIT
Nikita Popov [Thu, 13 Jun 2019 09:53:31 +0000 (11:53 +0200)]
Fix bug #78154 with JIT

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 08:59:18 +0000 (10:59 +0200)]
Merge branch 'PHP-7.4'

6 years agoFixed bug #78154
Nikita Popov [Thu, 13 Jun 2019 08:59:01 +0000 (10:59 +0200)]
Fixed bug #78154

6 years agoReenable -Werror for macos build
Nikita Popov [Thu, 13 Jun 2019 08:34:49 +0000 (10:34 +0200)]
Reenable -Werror for macos build

6 years agoSuppress -Wtautological-compare in dasc file
Nikita Popov [Thu, 13 Jun 2019 07:58:55 +0000 (09:58 +0200)]
Suppress -Wtautological-compare in dasc file

6 years agoDetermine thread ID on macos
Nikita Popov [Thu, 13 Jun 2019 07:55:09 +0000 (09:55 +0200)]
Determine thread ID on macos

Also initialize the variable to 0 -- I don't think we really care
if this is not determine on some platform, but it should at least
not be uninitialized.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 07:38:19 +0000 (09:38 +0200)]
Merge branch 'PHP-7.4'

6 years agoFixed bug #78151
Nikita Popov [Thu, 13 Jun 2019 07:37:30 +0000 (09:37 +0200)]
Fixed bug #78151

6 years agoDon't throw warning if testing multiple ports
Nikita Popov [Wed, 12 Jun 2019 14:57:28 +0000 (16:57 +0200)]
Don't throw warning if testing multiple ports

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Wed, 12 Jun 2019 20:39:43 +0000 (22:39 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  test for bug #78151

6 years agotest for bug #78151
Joe Watkins [Wed, 12 Jun 2019 20:39:00 +0000 (22:39 +0200)]
test for bug #78151

6 years agotemporarily disable werror on mac in master because of build failures in JIT
Joe Watkins [Wed, 12 Jun 2019 19:54:22 +0000 (21:54 +0200)]
temporarily disable werror on mac in master because of build failures in JIT

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Wed, 12 Jun 2019 18:21:59 +0000 (20:21 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Revert "micro-optimization"

This micro optimization caused several bugs in at least Xdebug, while
i_init_func_execute_data is not exported, APIs that are exported call it
this makes their use awkward for no real gain.

6 years agoRevert "micro-optimization"
Joe Watkins [Wed, 12 Jun 2019 18:04:47 +0000 (20:04 +0200)]
Revert "micro-optimization"

This reverts commit 374f7699821eb723a3a82a9854d18c0530b9d4e9.

6 years agoConstify some char* arguments or return values of ZEND_API
twosee [Sun, 26 May 2019 05:53:26 +0000 (13:53 +0800)]
Constify some char* arguments or return values of ZEND_API

Closes GH-4247.

6 years agoMark label as potentially unused
Nikita Popov [Wed, 12 Jun 2019 14:47:48 +0000 (16:47 +0200)]
Mark label as potentially unused

6 years agoAdd do...while(0) for RETURN_* and ZVAL_* APIs
twosee [Wed, 12 Jun 2019 10:49:33 +0000 (18:49 +0800)]
Add do...while(0) for RETURN_* and ZVAL_* APIs

Closes GH-4255.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 12 Jun 2019 14:16:39 +0000 (16:16 +0200)]
Merge branch 'PHP-7.4'

6 years agoEnable -Werror on macos builds
Nikita Popov [Wed, 12 Jun 2019 13:30:44 +0000 (15:30 +0200)]
Enable -Werror on macos builds

6 years agoSkip syntax errors in skipif conditions
Nikita Popov [Wed, 12 Jun 2019 13:56:38 +0000 (15:56 +0200)]
Skip syntax errors in skipif conditions

6 years agoFix two 32-bit tests for zpp changes
Nikita Popov [Wed, 12 Jun 2019 13:47:42 +0000 (15:47 +0200)]
Fix two 32-bit tests for zpp changes