This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
=== modified file 'OpenSSL/ssl/context.c' | |
--- OpenSSL/ssl/context.c 2011-09-11 13:35:32 +0000 | |
+++ OpenSSL/ssl/context.c 2012-02-09 05:35:09 +0000 | |
@@ -238,6 +238,66 @@ | |
} | |
/* | |
+ * Globally defined next proto callback. This is called from OpenSSL internally. | |
+ * The GIL will not be held when this function is invoked. It must not be held | |
+ * when the function returns. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/sprout/lib/sprout/user.rb b/sprout/lib/sprout/user.rb | |
index 9a2e193..93d96de 100644 | |
--- a/sprout/lib/sprout/user.rb | |
+++ b/sprout/lib/sprout/user.rb | |
@@ -209,8 +209,8 @@ module Sprout | |
tool = clean_path(tool) | |
runner = get_process_runner("#{tool} #{options}") | |
- result = runner.read | |
error = runner.read_err |
NewerOlder