Merge pull request #135

Author: jmikola

php_phongo.c

@@ -916,7 +916,7 @@ bool phongo_stream_socket_check_closed(mongoc_stream_t *stream) /* {{{ */
 	php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream;
 	TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
 
-	return PHP_STREAM_OPTION_RETURN_OK == php_stream_set_option(base_stream->stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0, NULL);
+	return PHP_STREAM_OPTION_RETURN_OK != php_stream_set_option(base_stream->stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0, NULL);
 } /* }}} */
 
 mongoc_stream_t* phongo_stream_get_base_stream(mongoc_stream_t *stream) /* {{{ */

tests/standalone/bug0487-001.phpt

@@ -0,0 +1,29 @@
+--TEST--
+PHPC-487: check_closed stream handler should not report open socket as closed
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; SLOW(); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$m = new MongoDB\Driver\Manager(STANDALONE);
+
+$bulk = new MongoDB\Driver\BulkWrite;
+$bulk->insert(['x' => 1]);
+$wr = $m->executeBulkWrite(NS, $bulk);
+var_dump($wr->getInsertedCount());
+
+sleep(1);
+
+$bulk = new MongoDB\Driver\BulkWrite;
+$bulk->insert(['x' => 1]);
+$wr = $m->executeBulkWrite(NS, $bulk);
+var_dump($wr->getInsertedCount());
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+int(1)
+int(1)
+===DONE===

tests/standalone/bug0487-002.phpt

@@ -0,0 +1,92 @@
+--TEST--
+PHPC-487: check_closed stream handler should report closed socket as closed
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; SLOW(); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+function mo_delete($id) {
+    $url = getMOUri() . $id;
+
+    $opts = array("http" =>
+        array(
+            "method"  => "DELETE",
+            "timeout" => 60,
+            "header"  => "Accept: application/json\r\n" .
+            "Content-type: application/x-www-form-urlencoded",
+            "ignore_errors" => true,
+        ),
+    );
+
+    $context = stream_context_create($opts);
+    $out = file_get_contents($url, false, $context);
+}
+
+function mo_post($url, $body) {
+    global $KILLLIST;
+
+    $url = getMOUri() . $url;
+
+    $opts = array("http" =>
+        array(
+            "method"  => "POST",
+            "timeout" => 60,
+            "header"  => "Accept: application/json\r\n" .
+            "Content-type: application/x-www-form-urlencoded",
+            "content" => json_encode($body),
+            "ignore_errors" => true,
+        ),
+    );
+
+    $context = stream_context_create($opts);
+    $out = file_get_contents($url, false, $context);
+    $array = json_decode($out, true);
+    if ($array && !empty($array["mongodb_uri"])) {
+        $KILLLIST[] = $array["id"];
+        return $array["mongodb_uri"];
+    }
+}
+$KILLLIST = array();
+
+$dsn = mo_post("/servers", [
+    'id' => 'serverA',
+    'name' => 'mongod',
+]);
+
+$m = new MongoDB\Driver\Manager($dsn);
+
+$bulk = new MongoDB\Driver\BulkWrite;
+$bulk->insert(['x' => 1]);
+$wr = $m->executeBulkWrite(NS, $bulk);
+var_dump($wr->getInsertedCount());
+
+mo_post("/servers/serverA", ['action' => 'stop']);
+
+echo throws(function() use ($m) {
+    $bulk = new MongoDB\Driver\BulkWrite;
+    $bulk->insert(['x' => 1]);
+    $wr = $m->executeBulkWrite(NS, $bulk);
+    var_dump($wr->getInsertedCount());
+}, 'MongoDB\Driver\Exception\RuntimeException'), "\n";
+
+mo_post("/servers/serverA", ['action' => 'restart']);
+
+$bulk = new MongoDB\Driver\BulkWrite;
+$bulk->insert(['x' => 1]);
+$wr = $m->executeBulkWrite(NS, $bulk);
+var_dump($wr->getInsertedCount());
+
+foreach($KILLLIST as $id) {
+    mo_delete("/servers/$id");
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+int(1)
+OK: Got MongoDB\Driver\Exception\RuntimeException
+Failed to read 4 bytes from socket within 300000 milliseconds.
+int(1)
+===DONE===