diff options
| -rw-r--r-- | TSRM/TSRM.h | 6 | ||||
| -rw-r--r-- | azure/job.yml | 4 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_recvmsg.phpt | 4 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt | 8 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt | 8 | ||||
| -rw-r--r-- | ext/zip/config.m4 | 5 | ||||
| -rw-r--r-- | sapi/embed/php_embed.c | 1 |
7 files changed, 14 insertions, 22 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 9a5940ea5f..ed2dcc0d5a 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -163,13 +163,7 @@ TSRM_API const char *tsrm_api_name(void); #define TSRMG_FAST_BULK_STATIC(offset, type) ((type) (((char*) TSRMLS_CACHE)+(offset))) #define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE; #define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL; -#if ZEND_DEBUG #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache() -#define TSRMLS_CACHE_RESET() -#else -#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache() -#define TSRMLS_CACHE_RESET() TSRMLS_CACHE = NULL -#endif #define TSRMLS_CACHE _tsrm_ls_cache #ifdef __cplusplus diff --git a/azure/job.yml b/azure/job.yml index 8a5c2244ee..e55fc6ee32 100644 --- a/azure/job.yml +++ b/azure/job.yml @@ -83,10 +83,10 @@ jobs: parameters: configurationName: ${{ parameters.configurationName }} runTestsName: 'OpCache' - runTestsParameters: -dopcache.enable_cli=1 + runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1 - ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/PHP-7.4') }}: - template: test.yml parameters: configurationName: ${{ parameters.configurationName }} runTestsName: 'JIT' - runTestsParameters: -dopcache.enable_cli=1 -dopcache.jit_buffer_size=16M + runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1 -d opcache.jit_buffer_size=16M diff --git a/ext/sockets/tests/socket_recvmsg.phpt b/ext/sockets/tests/socket_recvmsg.phpt index 4265e02535..2d7a2f0d69 100644 --- a/ext/sockets/tests/socket_recvmsg.phpt +++ b/ext/sockets/tests/socket_recvmsg.phpt @@ -30,12 +30,12 @@ socket_set_nonblock($sends1) or die("Could not put in non-blocking mode"); echo "creating receive socket\n"; $s = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP) or die("err"); var_dump($s); -$br = socket_bind($s, '::0', 3000) or die("err"); +$br = socket_bind($s, '::0', 3001) or die("err"); var_dump($br); socket_set_option($s, IPPROTO_IPV6, IPV6_RECVPKTINFO, 1) or die("err"); -$r = socket_sendto($sends1, $m = "testing packet", strlen($m), 0, $addr, 3000); +$r = socket_sendto($sends1, $m = "testing packet", strlen($m), 0, $addr, 3001); var_dump($r); if ($r < 12) die; checktimeout($s, 500); diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt index 5082e74f8f..be42447f58 100644 --- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt +++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt @@ -27,21 +27,21 @@ $addr = '::1'; echo "creating send socket\n"; $sends1 = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP) or die("err"); var_dump($sends1); -$br = socket_bind($sends1, '::', 7001) or die("err"); +$br = socket_bind($sends1, '::', 7002) or die("err"); var_dump($br); socket_set_nonblock($sends1) or die("Could not put in non-blocking mode"); echo "creating receive socket\n"; $s = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP) or die("err"); var_dump($s); -$br = socket_bind($s, '::0', 3000) or die("err"); +$br = socket_bind($s, '::0', 3002) or die("err"); var_dump($br); socket_set_option($s, IPPROTO_IPV6, IPV6_RECVPKTINFO, 1) or die("err"); socket_set_option($s, IPPROTO_IPV6, IPV6_RECVTCLASS, 1) or die("err"); $r = socket_sendmsg($sends1, [ - "name" => [ "addr" => "::1", "port" => 3000], + "name" => [ "addr" => "::1", "port" => 3002], "iov" => ["test ", "thing", "\n"], "control" => [[ "level" => IPPROTO_IPV6, @@ -74,7 +74,7 @@ Array ( [family] => %d [addr] => ::1 - [port] => 7001 + [port] => 7002 [flowinfo] => 0 [scope_id] => 0 ) diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt index 70867e755a..88654e1973 100644 --- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt +++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt @@ -18,21 +18,21 @@ $addr = '::1'; echo "creating send socket\n"; $sends1 = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP) or die("err"); var_dump($sends1); -$br = socket_bind($sends1, '::', 7001) or die("err"); +$br = socket_bind($sends1, '::', 7003) or die("err"); var_dump($br); socket_set_nonblock($sends1) or die("Could not put in non-blocking mode"); echo "creating receive socket\n"; $s = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP) or die("err"); var_dump($s); -$br = socket_bind($s, '::0', 3000) or die("err"); +$br = socket_bind($s, '::0', 3003) or die("err"); var_dump($br); socket_set_option($s, IPPROTO_IPV6, IPV6_RECVPKTINFO, 1) or die("err"); socket_set_option($s, IPPROTO_IPV6, IPV6_RECVTCLASS, 1) or die("err"); $r = socket_sendmsg($sends1, [ - "name" => [ "addr" => "::1", "port" => 3000], + "name" => [ "addr" => "::1", "port" => 3003], "iov" => ["test ", "thing", "\n"], "control" => [[ "level" => IPPROTO_IPV6, @@ -68,7 +68,7 @@ Array ( [family] => %d [addr] => ::1 - [port] => 7001 + [port] => 7003 [flowinfo] => 0 [scope_id] => 0 ) diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 70eafcdc98..ae7535f620 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -8,7 +8,6 @@ if test "$PHP_ZIP" != "no"; then PHP_EVAL_INCLINE($LIBZIP_CFLAGS) PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD) - LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip` AC_DEFINE(HAVE_LIBZIP, 1, [ ]) @@ -18,7 +17,7 @@ if test "$PHP_ZIP" != "no"; then ], [ AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support) ], [ - -L$LIBZIP_LIBDIR + $LIBZIP_LIBS ]) PHP_CHECK_LIBRARY(zip, zip_libzip_version, @@ -26,7 +25,7 @@ if test "$PHP_ZIP" != "no"; then AC_DEFINE(HAVE_LIBZIP_VERSION, 1, [Libzip >= 1.3.1 with zip_libzip_version function]) ], [ ], [ - -L$LIBZIP_LIBDIR + $LIBZIP_LIBS ]) AC_DEFINE(HAVE_ZIP,1,[ ]) diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index d651f6b491..4c7dec6dd0 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -225,7 +225,6 @@ EMBED_SAPI_API void php_embed_shutdown(void) sapi_shutdown(); #ifdef ZTS tsrm_shutdown(); - TSRMLS_CACHE_RESET(); #endif if (php_embed_module.ini_entries) { free(php_embed_module.ini_entries); |