Merge pull request redis#53 from maximebedard/bump-to-014

Bump to 0.1.14
ali-hassan · Nov 8, 2018 · a5b018b · a5b018b
2 parents 5a5cf1e + 5284a04
commit a5b018b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ext/hiredis_ext/connection.c b/ext/hiredis_ext/connection.c
@@ -30,7 +30,7 @@ static void parent_context_mark(redisParentContext *pc) {
     // volatile until rb_gc_mark
     volatile VALUE root;
     if (pc->context && pc->context->reader) {
-        root = (VALUE)redisReplyReaderGetObject(pc->context->reader);
+        root = (VALUE)redisReaderGetObject(pc->context->reader);
         if (root != 0 && TYPE(root) == T_ARRAY) {
             rb_gc_mark(root);
         }

diff --git a/test/connection_test.rb b/test/connection_test.rb
@@ -82,7 +82,7 @@ def test_connect_wrong_host
     ex = assert_raises RuntimeError do
       hiredis.connect("nonexisting", 6379)
     end
-    assert ex.message =~ /(can't resolve)|(name or service not known)/i
+    assert ex.message =~ /(can't resolve)|(name or service not known)|(nodename nor servname provided, or not known)/i
   end
 
   def test_connect_wrong_port

diff --git a/vendor/hiredis b/vendor/hiredis
+21 −0		.travis.yml
+43 −1		CHANGELOG.md
+11 −15		Makefile
+23 −4		README.md
+12 −12		adapters/libevent.h
+3 −2		adapters/libuv.h
+23 −0		appveyor.yml
+37 −8		async.c
+1 −0		async.h
+2 −2		dict.c
+1 −1		examples/example.c
+4 −13		fmacros.h
+19 −34		hiredis.c
+6 −30		hiredis.h
+42 −23		net.c
+0 −4		net.h
+117 −44		read.c
+4 −9		read.h
+342 −165		sds.c
+184 −16		sds.h
+42 −0		sdsalloc.h
+130 −14		test.c