diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-26 13:28:49 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-26 13:28:49 +0200 |
| commit | 19df3c1b1c3bcb120ba63d3537e7177b8826fb96 (patch) | |
| tree | dc5b94837a605c63d9e99264b116099b4d18ed0e /ext/standard/tests/streams | |
| parent | 459e758f039c59180b1729dada841a0520e67c5b (diff) | |
| parent | 4e9db5ba9fd0dcaa5f86dc644dfa8a7897ae8dd7 (diff) | |
| download | php-git-19df3c1b1c3bcb120ba63d3537e7177b8826fb96.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
Diffstat (limited to 'ext/standard/tests/streams')
| -rw-r--r-- | ext/standard/tests/streams/bug61371-win.phpt | 45 | ||||
| -rw-r--r-- | ext/standard/tests/streams/bug61371.phpt | 5 |
2 files changed, 50 insertions, 0 deletions
diff --git a/ext/standard/tests/streams/bug61371-win.phpt b/ext/standard/tests/streams/bug61371-win.phpt new file mode 100644 index 0000000000..dc70530447 --- /dev/null +++ b/ext/standard/tests/streams/bug61371-win.phpt @@ -0,0 +1,45 @@ +--TEST-- +Bug #61371: stream_context_create() causes memory leaks on use streams_socket_create +--SKIPIF-- +<?php +if(substr(PHP_OS, 0, 3) != 'WIN' ) { + die('skip windows only test'); +} +--FILE-- +<?php +function test($doFclose) { +$previous = null; +$current = null; +for($test=1;$test<=3;$test++) { + $current = memory_get_usage(true); + if (!is_null($previous)) { + var_dump($previous == $current); + } + $previous = $current; + echo 'memory: '.round($current / 1024, 0)."kb\n"; + for($i=0;$i<=100;$i++) { + $context = stream_context_create(array()); + $stream = stream_socket_client('udp://127.0.0.1:80', $errno, $errstr, 10, STREAM_CLIENT_CONNECT, $context); + if ($doFclose) fclose($stream); + unset($context); + unset($stream); + unset($errno); + unset($errstr); + } +} +} + +test(true); +test(false); +?> +--EXPECTF-- +memory: %dkb +bool(true) +memory: %dkb +bool(true) +memory: %dkb +memory: %dkb +bool(true) +memory: %dkb +bool(true) +memory: %dkb diff --git a/ext/standard/tests/streams/bug61371.phpt b/ext/standard/tests/streams/bug61371.phpt index 7fbfa56ba2..7c64d1d30f 100644 --- a/ext/standard/tests/streams/bug61371.phpt +++ b/ext/standard/tests/streams/bug61371.phpt @@ -1,5 +1,10 @@ --TEST-- Bug #61371: stream_context_create() causes memory leaks on use streams_socket_create +--SKIPIF-- +<?php +if(substr(PHP_OS, 0, 3) == 'WIN' ) { + die('skip non windows test'); +} --FILE-- <?php function test($doFclose) { |