Merge remote-tracking branch 'origin/v0.6'

Conflicts:
	src/udp_wrap.cc

1 files changed, 15 insertions, 12 deletions

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index bcd3949ec..5f58240e0 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -151,6 +151,7 @@ void SecureContext::Initialize(Handle<Object> target) {
   NODE_SET_PROTOTYPE_METHOD(t, "addRootCerts", SecureContext::AddRootCerts);
   NODE_SET_PROTOTYPE_METHOD(t, "setCiphers", SecureContext::SetCiphers);
   NODE_SET_PROTOTYPE_METHOD(t, "setOptions", SecureContext::SetOptions);
+  NODE_SET_PROTOTYPE_METHOD(t, "clearOptions", SecureContext::ClearOptions);
   NODE_SET_PROTOTYPE_METHOD(t, "setSessionIdContext",
                                SecureContext::SetSessionIdContext);
   NODE_SET_PROTOTYPE_METHOD(t, "close", SecureContext::Close);
@@ -525,21 +526,23 @@ Handle<Value> SecureContext::SetCiphers(const Arguments& args) {
   return True();
 }
 
-Handle<Value> SecureContext::SetOptions(const Arguments& args) {
-  HandleScope scope;
-
-  SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder());
-
-  if (args.Length() != 1 || !args[0]->IsUint32()) {
-    return ThrowException(Exception::TypeError(String::New("Bad parameter")));
+#define X(name, fn)                                                           \
+  Handle<Value> name(const Arguments& args) {                                 \
+    HandleScope scope;                                                        \
+    SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder());     \
+    if (args.Length() != 1 || !args[0]->IsInt32()) {                          \
+      return ThrowException(                                                  \
+          Exception::TypeError(String::New("Bad parameter")));                \
+    }                                                                         \
+    fn(sc->ctx_, args[0]->Int32Value());                                      \
+    return True();                                                            \
   }
 
-  unsigned int opts = args[0]->Uint32Value();
-
-  SSL_CTX_set_options(sc->ctx_, opts);
+// can't use templates, SSL_CTX_set_options and SSL_CTX_clear_options are macros
+X(SecureContext::SetOptions,   SSL_CTX_set_options)
+X(SecureContext::ClearOptions, SSL_CTX_clear_options)
 
-  return True();
-}
+#undef X
 
 Handle<Value> SecureContext::SetSessionIdContext(const Arguments& args) {
   HandleScope scope;