[DRE-commits] [ruby-curb] 03/04: Add support for curl 7.33.0

[David Suárez]

This is an automated email from the git hooks/post-receive script.

deiv-guest pushed a commit to branch master
in repository ruby-curb.

commit 0132890a6a6a45447ecb665f15fd162e63b4242d
Author: David Suárez <david.sephirot at gmail.com>
Date:   Sun Oct 20 11:58:23 2013 +0200

    Add support for curl 7.33.0
---
 debian/patches/add-support-for-curl-7.33.0.patch |   57 ++++++++++++++++++++++
 debian/patches/series                            |    1 +
 2 files changed, 58 insertions(+)

diff --git a/debian/patches/add-support-for-curl-7.33.0.patch b/debian/patches/add-support-for-curl-7.33.0.patch
new file mode 100644
index 0000000..b8aa5a5
--- /dev/null
+++ b/debian/patches/add-support-for-curl-7.33.0.patch
@@ -0,0 +1,57 @@
+Description: Add support for curl 7.33.0
+ Handle the new error code 'CURLM_ADDED_ALREADY'. This fix the test
+ 'test_reusing_handle' that fails because an unexpected exception.
+
+Author: David Suárez <david.sephirot at gmail.com>
+Forwarded: https://github.com/taf2/curb/pull/169
+Last-Update: 2013-10-20
+
+--- ruby-curb-0.8.5.orig/ext/curb_errors.c
++++ ruby-curb-0.8.5/ext/curb_errors.c
+@@ -118,6 +118,7 @@ VALUE mCurlErrBadEasyHandle;
+ VALUE mCurlErrOutOfMemory;
+ VALUE mCurlErrInternalError;
+ VALUE mCurlErrBadSocket;
++VALUE mCurlErrAddedAlready;
+ VALUE mCurlErrUnknownOption;
+ 
+ /* binding errors */
+@@ -493,6 +494,9 @@ VALUE rb_curl_multi_error(CURLMcode code
+       exclz = mCurlErrUnknownOption;
+       break;
+ #endif
++    case CURLM_ADDED_ALREADY: /* 7 */
++      exclz = mCurlErrAddedAlready;
++      break;
+     default:
+       exclz = eCurlErrError;
+       exmsg = "Unknown error result from libcurl";
+@@ -625,6 +629,7 @@ void init_curb_errors() {
+   mCurlErrOutOfMemory        = rb_define_class_under(mCurlErr, "MultiOutOfMemory", eCurlErrError);
+   mCurlErrInternalError      = rb_define_class_under(mCurlErr, "MultiInternalError", eCurlErrError);
+   mCurlErrBadSocket          = rb_define_class_under(mCurlErr, "MultiBadSocket", eCurlErrError);
++  mCurlErrAddedAlready       = rb_define_class_under(mCurlErr, "MultiAddedAlready", eCurlErrError);
+   mCurlErrUnknownOption      = rb_define_class_under(mCurlErr, "MultiUnknownOption", eCurlErrError);
+ 
+   eCurlErrLDAPInvalidURL = rb_define_class_under(mCurlErr, "InvalidLDAPURLError", eCurlErrLDAPError);
+--- ruby-curb-0.8.5.orig/ext/curb_errors.h
++++ ruby-curb-0.8.5/ext/curb_errors.h
+@@ -116,6 +116,7 @@ extern VALUE mCurlErrOutOfMemory;
+ extern VALUE mCurlErrInternalError;
+ extern VALUE mCurlErrBadSocket;
+ extern VALUE mCurlErrUnknownOption;
++extern VALUE mCurlErrAddedAlready;
+ 
+ /* binding errors */
+ extern VALUE eCurlErrInvalidPostField;
+--- ruby-curb-0.8.5.orig/tests/tc_curl_multi.rb
++++ ruby-curb-0.8.5/tests/tc_curl_multi.rb
+@@ -466,7 +466,7 @@ class TestCurbCurlMulti < Test::Unit::Te
+     m.add(c)
+     m.add(c)
+   rescue => e
+-    assert_equal Curl::Err::MultiBadEasyHandle, e.class
++    assert_equal Curl::Err::MultiAddedAlready, e.class
+   end
+ 
+   def test_multi_default_timeout
diff --git a/debian/patches/series b/debian/patches/series
index 5f8264c..fa1bea4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable_test_requiring_network.patch
 remove-local-extension-dir-from-tests-loadpath.patch
+add-support-for-curl-7.33.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-curb.git