diff --git a/config.m4 b/config.m4 index c65e3a8..2a257c3 100644 --- a/config.m4 +++ b/config.m4 @@ -16,7 +16,7 @@ if test "$PHP_AWSCRT" != "no"; then platform_tls_libs="-ls2n -lcrypto" fi CRT_LIBPATHS="-L${cwd}/build/install/lib -L${cwd}/build/install/lib64" - CRT_LIBS="-laws-crt-ffi -laws-c-auth -laws-c-http -laws-c-io -laws-c-cal -laws-c-compression -laws-checksums -laws-c-common ${platform_tls_libs}" + CRT_LIBS="-laws-crt-ffi -laws-c-auth -laws-c-http -laws-c-io -laws-c-cal -laws-c-compression -laws-checksums -laws-c-sdkutils -laws-c-common ${platform_tls_libs}" PHP_ADD_INCLUDE(${cwd}/build/install/include) PHP_EVAL_LIBLINE([$CRT_LIBPATHS $CRT_LIBS], AWSCRT_SHARED_LIBADD) diff --git a/config.w32 b/config.w32 index d9b89e0..1ed1d36 100644 --- a/config.w32 +++ b/config.w32 @@ -6,7 +6,7 @@ if (PHP_AWSCRT != "no") { ADD_MAKEFILE_FRAGMENT(); DEFINE('CFLAGS_AWSCRT', '/I ' + configure_module_dirname + '\\build\\install\\include'); DEFINE('LIBS_AWSCRT', '/LIBPATH:' + configure_module_dirname + '\\build\\install\\lib ' + - 'aws-crt-ffi.lib aws-c-auth.lib aws-c-http.lib aws-c-io.lib aws-c-cal.lib aws-c-compression.lib aws-checksums.lib aws-c-common.lib ' + + 'aws-crt-ffi.lib aws-c-auth.lib aws-c-http.lib aws-c-io.lib aws-c-cal.lib aws-c-compression.lib aws-checksums.lib aws-c-sdkutils.lib aws-c-common.lib ' + 'ncrypt.lib Secur32.lib Crypt32.lib Shlwapi.lib'); DEFINE('AWSCRT_DIR', configure_module_dirname); EXTENSION("awscrt", "ext\\awscrt.c", PHP_AWSCRT_SHARED); diff --git a/crt/aws-crt-ffi b/crt/aws-crt-ffi index 12db522..a76a837 160000 --- a/crt/aws-crt-ffi +++ b/crt/aws-crt-ffi @@ -1 +1 @@ -Subproject commit 12db522f2ab106ff70b627db3acc2de379358eb2 +Subproject commit a76a837a8d30d18abc9a04b78c785e93f106d9c6 diff --git a/src/AWS/CRT/IO/InputStream.php b/src/AWS/CRT/IO/InputStream.php index ae5fd46..6aef709 100644 --- a/src/AWS/CRT/IO/InputStream.php +++ b/src/AWS/CRT/IO/InputStream.php @@ -14,6 +14,7 @@ final class InputStream extends NativeResource { const SEEK_END = 2; public function __construct($stream) { + parent::__construct(); $this->stream = $stream; $options = self::$crt->input_stream_options_new(); // The stream implementation in native just converts the PHP stream into @@ -24,7 +25,7 @@ final class InputStream extends NativeResource { } public function __destruct() { - self::$crt->input_stream_release($this->release()); + $this->release(); parent::__destruct(); }