com php-src: Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails: ext/standard/tests/streams/bug61371-win.phpt
ext/standard/tests/streams/bug61371.phpt
| From: | Anatoliy Belsky | Date: | Thu, 26 Apr 2012 11:27:01 +0000 |
| Subject: | com php-src: Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails: ext/standard/tests/streams/bug61371-win.phpt ext/standard/tests/streams/bug61371.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68876@lists.php.net to get a copy of this message | ||
Commit: 4e9db5ba9fd0dcaa5f86dc644dfa8a7897ae8dd7
Author: Anatoliy Belsky <ab@php.net> Thu, 26 Apr 2012 13:27:01 +0200
Parents: 433290e199e29f38cfebf54ba213f4abff4e328a
Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e9db5ba9fd0dcaa5f86dc644dfa8a7897ae8dd7
Log:
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
Bugs:
https://bugs.php.net/61800
https://bugs.php.net/61371
Changed paths:
A ext/standard/tests/streams/bug61371-win.phpt
M ext/standard/tests/streams/bug61371.phpt
Diff:
diff --git a/ext/standard/tests/streams/bug61371-win.phpt
b/ext/standard/tests/streams/bug61371-win.phpt
new file mode 100644
index 0000000..dc70530
--- /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 7fbfa56..7c64d1d 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) {