rhodes 3.4.2 → 3.5.1.12

data/lib/extensions/gcm-push/ext/android/ext_build.files

@@ -0,0 +1,3 @@
+ext/android/src/com/rhomobile/rhodes/gcm/GCMFacade.java
+ext/android/src/com/rhomobile/rhodes/gcm/GCMBroadcastReceiver.java
+ext/android/src/com/rhomobile/rhodes/gcm/GCMIntentService.java

data/lib/extensions/gcm-push/ext/android/jni/src/com_rhomobile_rhodes_gcm_GCMRhoListener.h

@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_rhomobile_rhodes_gcm_GCMRhoListener */
+
+#ifndef _Included_com_rhomobile_rhodes_gcm_GCMRhoListener
+#define _Included_com_rhomobile_rhodes_gcm_GCMRhoListener
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_rhomobile_rhodes_gcm_GCMRhoListener
+ * Method:    nativeAddGCMPushClient
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_gcm_GCMRhoListener_nativeAddGCMPushClient
+  (JNIEnv *, jclass);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

data/lib/extensions/gcm-push/ext/android/jni/src/gcmpushclient.cpp

@@ -0,0 +1,173 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+*
+* Copyright (c) 2008-2012 Rhomobile, Inc.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#include "rhodes/JNIRhodes.h"
+#include "common/RhoConf.h"
+#include "common/RhodesApp.h"
+#include "sync/ClientRegister.h"
+#include "sync/ILoginListener.h"
+
+#include "logging/RhoLog.h"
+
+#include "gcmpushclient.h"
+#include "com_rhomobile_rhodes_gcm_GCMRhoListener.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "GcmPushJNI"
+
+//----------------------------------------------------------------------------------------------------------------------
+extern "C" void Init_GCMPushClient()
+{
+    // create GCM push client
+    RHODESAPP().addPushClient(new rho::gcm::GcmPushClient());
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_gcm_GCMRhoListener_nativeAddGCMPushClient (JNIEnv *, jclass)
+{
+
+    // create GCM push client
+    RHODESAPP().addPushClient(new rho::gcm::GcmPushClient());
+}
+
+
+namespace rho { namespace gcm {
+
+//----------------------------------------------------------------------------------------------------------------------
+class GcmPushClient::SyncLoginListener : public sync::ILoginListener
+{
+    static const char* const s_GCM_FACADE_CLASS;
+
+    static void GcmPushRegister();
+    static void GcmPushUnregister();
+public:
+    virtual ~SyncLoginListener() {}
+    virtual void onLogin(const String& user, const String& pass, const String& session) const;
+    virtual void onLogout(const String& session) const;
+};
+//----------------------------------------------------------------------------------------------------------------------
+
+const char* const GcmPushClient::SyncLoginListener::s_GCM_FACADE_CLASS = "com.rhomobile.rhodes.gcm.GCMFacade";
+
+//----------------------------------------------------------------------------------------------------------------------
+void GcmPushClient::SyncLoginListener::GcmPushRegister()
+{
+    LOG(TRACE) + "GcmPushRegister()";
+
+    JNIEnv *env = jnienv();
+
+    static jclass cls = rho_find_class(env, s_GCM_FACADE_CLASS);
+    if (!cls) {
+        LOG(ERROR) + "Cannot find class: " + s_GCM_FACADE_CLASS;
+        return;
+    }
+
+    static jmethodID mid = env->GetStaticMethodID(cls, "Register", "()V");
+    if (!mid) {
+        LOG(ERROR) + "Cannot get " + s_GCM_FACADE_CLASS + ".Register() method";
+        return;
+    }
+
+    env->CallStaticVoidMethod(cls, mid);
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+void GcmPushClient::SyncLoginListener::GcmPushUnregister()
+{
+    LOG(TRACE) + "GcmPushUnregister()";
+
+    JNIEnv *env = jnienv();
+
+    static jclass cls = rho_find_class(env, s_GCM_FACADE_CLASS);
+    if (!cls) {
+        LOG(ERROR) + "Cannot find class: " + s_GCM_FACADE_CLASS;
+        return;
+    }
+
+    static jmethodID mid = env->GetStaticMethodID(cls, "Unregister", "()V");
+    if (!mid) {
+        LOG(ERROR) + "Cannot get " + s_GCM_FACADE_CLASS + ".Unregister() method";
+        return;
+    }
+
+    env->CallStaticVoidMethod(cls, mid);
+}
+//----------------------------------------------------------------------------------------------------------------------
+void GcmPushClient::SyncLoginListener::onLogin(const String& user, const String& pass, const String& session) const
+{
+    sync::CClientRegister::Get()->setDevicehPin("");
+    GcmPushRegister();
+}
+//----------------------------------------------------------------------------------------------------------------------
+void GcmPushClient::SyncLoginListener::onLogout(const String& session) const
+{
+    sync::CClientRegister::Get()->setDevicehPin("");
+    GcmPushUnregister();
+}
+//----------------------------------------------------------------------------------------------------------------------
+const String GcmPushClient::s_Type = "gcm";
+
+GcmPushClient::GcmPushClient()
+{
+    sync::CClientRegister::AddLoginListener(new SyncLoginListener());
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+void GcmPushClient::init()
+{
+    if(!sync::CClientRegister::getInstance())
+    {
+        sync::CClientRegister::Create();
+    }
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+void GcmPushClient::setNotificationUrl(const String& callbackUrl, const String& callbackParam)
+{
+    m_strCallbackUrl = callbackUrl;
+    m_strCallbackParam = callbackParam;
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+bool GcmPushClient::callNotification(const String& json, const String& data)
+{
+    String finalData = m_strCallbackParam;
+    if(data.length() > 0)
+    {
+        if(finalData.length() > 0)
+            finalData += '&';
+        finalData += data;
+    }
+    if(m_strCallbackUrl.length() > 0)
+    {
+        return RHODESAPP().callPushCallbackWithJsonBody(m_strCallbackUrl, json, finalData);
+    }
+
+    return false;
+}
+
+}}
+

data/lib/extensions/gcm-push/ext/android/jni/src/gcmpushclient.h

@@ -0,0 +1,62 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+*
+* Copyright (c) 2008-2012 Rhomobile, Inc.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#ifndef GCMPUSHCLIENT_H_
+#define GCMPUSHCLIENT_H_
+
+#include "common/push/IRhoPushClient.h"
+
+#include "logging/RhoLog.h"
+#include "common/RhoStd.h"
+
+
+namespace rho { namespace gcm {
+
+using namespace rho::common;
+
+class GcmPushClient: public IRhoPushClient
+{
+    class SyncLoginListener;
+private:
+    static const String s_Type;
+    String m_strCallbackUrl;
+    String m_strCallbackParam;
+public:
+    GcmPushClient();
+    virtual ~GcmPushClient() {}
+
+    virtual const String& getType() const { return s_Type; }
+
+    virtual void init();
+    virtual void setNotificationUrl(const String& callBackUrl, const String& urlParams);
+    virtual bool callNotification(const String& json, const String& data);
+
+};
+
+
+}}
+
+#endif /* GCMPUSHCLIENT_H_ */

data/lib/extensions/gcm-push/ext/android/src/com/rhomobile/rhodes/gcm/GCMBroadcastReceiver.java

@@ -0,0 +1,40 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+*
+* Copyright (c) 2008-2012 Rhomobile, Inc.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.gcm;
+
+import android.content.Context;
+
+public final class GCMBroadcastReceiver extends
+        com.google.android.gcm.GCMBroadcastReceiver {
+    
+    @Override
+    public String getGCMIntentServiceClassName(Context context) {
+        return GCMIntentService.class.getCanonicalName();
+        
+    }
+
+}

data/lib/extensions/gcm-push/ext/android/src/com/rhomobile/rhodes/gcm/GCMFacade.java

@@ -0,0 +1,55 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+*
+* Copyright (c) 2008-2012 Rhomobile, Inc.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.gcm;
+
+import com.google.android.gcm.GCMRegistrar;
+import com.rhomobile.rhodes.Push;
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.util.ContextFactory;
+
+public final class GCMFacade {
+    private static final String TAG = GCMFacade.class.getSimpleName();
+    
+    static final String GCM_PUSH_CLIENT = "gcm";
+    
+    public static void Register() {
+        Logger.T(TAG, "Send GCM push register req");
+        if (GCMRegistrar.isRegistered(ContextFactory.getContext())) {
+            Logger.T(TAG, "Already has GCM push registeration");
+        }
+        else {
+            Logger.T(TAG, "Send GCM push register req");
+            GCMRegistrar.register(ContextFactory.getContext(), Push.SENDER/*RhodesService.getBuildConfig("gcm_push_sender")*/);
+        }
+    }
+
+    public static void Unregister() {
+        Logger.T(TAG, "GCM push unregister req");
+        GCMRegistrar.unregister(ContextFactory.getContext());
+    }
+
+}

data/lib/extensions/gcm-push/ext/android/src/com/rhomobile/rhodes/gcm/GCMIntentService.java

@@ -0,0 +1,60 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+*
+* Copyright (c) 2008-2012 Rhomobile, Inc.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.gcm;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.google.android.gcm.GCMBaseIntentService;
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.PushContract;
+
+public final class GCMIntentService extends GCMBaseIntentService {
+
+    @Override
+    protected void onRegistered(Context context, String pin) {
+        Logger.T(TAG, "GCM push registation: " + pin);
+        PushContract.handleRegistration(context, pin, GCMFacade.GCM_PUSH_CLIENT);
+    }
+
+    @Override
+    protected void onUnregistered(Context context, String pin) {
+        Logger.T(TAG, "GCM push unregistation: " + pin);
+    }
+
+    @Override
+    protected void onMessage(Context context, Intent intent) {
+        Logger.T(TAG, "GCM push message: " + intent);
+        PushContract.handleMessage(context, intent.getExtras(), GCMFacade.GCM_PUSH_CLIENT);
+    }
+
+    @Override
+    protected void onError(Context context, String error) {
+        Logger.T(TAG, "GCM push error: " + error);
+        PushContract.handleError(context, error, GCMFacade.GCM_PUSH_CLIENT);
+    }
+}

data/lib/extensions/gcm-push/ext/build

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+
+if [ "$RHO_PLATFORM" = "android" ]; then
+
+cd android
+rake --trace
+
+fi
+
+
+

data/lib/extensions/gcm-push/ext/build.bat

@@ -0,0 +1,8 @@
+
+if "%RHO_PLATFORM%" == "android" (
+
+cd android
+rake --trace
+
+)
+

data/lib/extensions/net-http/net/http.rb

@@ -4,28 +4,37 @@
 # Copyright (c) 1999-2007 Yukihiro Matsumoto
 # Copyright (c) 1999-2007 Minero Aoki
 # Copyright (c) 2001 GOTOU Yuuzou
-# 
+#
 # Written and maintained by Minero Aoki <aamine@loveruby.net>.
 # HTTPS support added by GOTOU Yuuzou <gotoyuzo@notwork.org>.
 #
 # This file is derived from "http-access.rb".
 #
 # Documented by Minero Aoki; converted to RDoc by William Webber.
-# 
+#
 # This program is free software. You can re-distribute and/or
 # modify this program under the same terms of ruby itself ---
 # Ruby Distribution License or GNU General Public License.
 #
-# See Net::HTTP for an overview and examples. 
-# 
+# See Net::HTTP for an overview and examples.
+#
 # NOTE: You can find Japanese version of this document here:
 # http://www.ruby-lang.org/ja/man/html/net_http.html
-# 
+#
 #--
 # $Id: http.rb 30571 2011-01-16 12:35:11Z yugui $
 #++
 
 require 'net/protocol'
+if System::get_property('platform') != 'Blackberry'
+  autoload :OpenSSL, 'openssl'
+else
+  module OpenSSL    
+    module SSL
+      VERIFY_NONE = 0
+    end
+  end
+end
 require 'uri'
 
 module Net   #:nodoc:
@@ -36,29 +45,29 @@ module Net   #:nodoc:
   # :startdoc:
 
   # == What Is This Library?
-  # 
+  #
   # This library provides your program functions to access WWW
   # documents via HTTP, Hyper Text Transfer Protocol version 1.1.
   # For details of HTTP, refer to [RFC2616]
   # (http://www.ietf.org/rfc/rfc2616.txt).
-  # 
+  #
   # == Examples
-  # 
+  #
   # === Getting Document From WWW Server
-  # 
+  #
   # Example #1: Simple GET+print
-  # 
+  #
   #     require 'net/http'
   #     Net::HTTP.get_print 'www.example.com', '/index.html'
-  # 
+  #
   # Example #2: Simple GET+print by URL
-  # 
+  #
   #     require 'net/http'
   #     require 'uri'
   #     Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
-  # 
+  #
   # Example #3: More generic GET+print
-  # 
+  #
   #     require 'net/http'
   #     require 'uri'
   #
@@ -69,7 +78,7 @@ module Net   #:nodoc:
   #     puts res.body
   #
   # Example #4: More generic GET+print
-  # 
+  #
   #     require 'net/http'
   #
   #     url = URI.parse('http://www.example.com/index.html')
@@ -78,9 +87,9 @@ module Net   #:nodoc:
   #       http.request(req)
   #     }
   #     puts res.body
-  # 
+  #
   # === Posting Form Data
-  # 
+  #
   #     require 'net/http'
   #     require 'uri'
   #
@@ -112,15 +121,15 @@ module Net   #:nodoc:
   #     res = Net::HTTP.post_form(URI.parse('http://www.example.com/search.cgi'),
   #                               {'q' => ['ruby', 'perl'], 'max' => '50'})
   #     puts res.body
-  # 
+  #
   # === Accessing via Proxy
-  # 
+  #
   # Net::HTTP.Proxy creates http proxy class. It has same
   # methods of Net::HTTP but its instances always connect to
   # proxy, instead of given host.
-  # 
+  #
   #     require 'net/http'
-  # 
+  #
   #     proxy_addr = 'your.proxy.host'
   #     proxy_port = 8080
   #             :
@@ -128,20 +137,20 @@ module Net   #:nodoc:
   #       # always connect to your.proxy.addr:8080
   #             :
   #     }
-  # 
+  #
   # Since Net::HTTP.Proxy returns Net::HTTP itself when proxy_addr is nil,
   # there's no need to change code if there's proxy or not.
-  # 
+  #
   # There are two additional parameters in Net::HTTP.Proxy which allow to
   # specify proxy user name and password:
-  # 
+  #
   #     Net::HTTP::Proxy(proxy_addr, proxy_port, proxy_user = nil, proxy_pass = nil)
-  # 
+  #
   # You may use them to work with authorization-enabled proxies:
-  # 
+  #
   #     require 'net/http'
   #     require 'uri'
-  #     
+  #
   #     proxy_host = 'your.proxy.host'
   #     proxy_port = 8080
   #     uri = URI.parse(ENV['http_proxy'])
@@ -154,16 +163,16 @@ module Net   #:nodoc:
   #
   # Note that net/http never rely on HTTP_PROXY environment variable.
   # If you want to use proxy, set it explicitly.
-  # 
+  #
   # === Following Redirection
-  # 
+  #
   #     require 'net/http'
   #     require 'uri'
-  # 
+  #
   #     def fetch(uri_str, limit = 10)
-  #       # You should choose better exception. 
+  #       # You should choose better exception.
   #       raise ArgumentError, 'HTTP redirect too deep' if limit == 0
-  # 
+  #
   #       response = Net::HTTP.get_response(URI.parse(uri_str))
   #       case response
   #       when Net::HTTPSuccess     then response
@@ -172,25 +181,25 @@ module Net   #:nodoc:
   #         response.error!
   #       end
   #     end
-  # 
+  #
   #     print fetch('http://www.ruby-lang.org')
-  # 
+  #
   # Net::HTTPSuccess and Net::HTTPRedirection is a HTTPResponse class.
   # All HTTPResponse objects belong to its own response class which
   # indicate HTTP result status. For details of response classes,
   # see section "HTTP Response Classes".
-  # 
+  #
   # === Basic Authentication
-  # 
+  #
   #     require 'net/http'
-  # 
+  #
   #     Net::HTTP.start('www.example.com') {|http|
   #       req = Net::HTTP::Get.new('/secret-page.html')
   #       req.basic_auth 'account', 'password'
   #       response = http.request(req)
   #       print response.body
   #     }
-  # 
+  #
   # === HTTP Request Classes
   #
   # Here is HTTP request class hierarchy.
@@ -263,22 +272,22 @@ module Net   #:nodoc:
   #           HTTPServiceUnavailable             # 503
   #           HTTPGatewayTimeOut                 # 504
   #           HTTPVersionNotSupported            # 505
-  # 
+  #
   # == Switching Net::HTTP versions
-  # 
+  #
   # You can use net/http.rb 1.1 features (bundled with Ruby 1.6)
   # by calling HTTP.version_1_1. Calling Net::HTTP.version_1_2
   # allows you to use 1.2 features again.
-  # 
+  #
   #     # example
   #     Net::HTTP.start {|http1| ...(http1 has 1.2 features)... }
-  # 
+  #
   #     Net::HTTP.version_1_1
   #     Net::HTTP.start {|http2| ...(http2 has 1.1 features)... }
-  # 
+  #
   #     Net::HTTP.version_1_2
   #     Net::HTTP.start {|http3| ...(http3 has 1.2 features)... }
-  # 
+  #
   # This function is NOT thread-safe.
   #
   class HTTP < Protocol
@@ -290,11 +299,11 @@ module Net   #:nodoc:
     begin
       if defined? RHO_ME
         HAVE_ZLIB=false      
-      else  
+      else
         require 'zlib'
         require 'stringio'  #for our purposes (unpacking gzip) lump these together
         HAVE_ZLIB=true
-      end    
+      end
     rescue LoadError
       HAVE_ZLIB=false
     end
@@ -342,7 +351,7 @@ module Net   #:nodoc:
     #
     # Get body from target and output it to +$stdout+.  The
     # target can either be specified as (+uri+), or as
-    # (+host+, +path+, +port+ = 80); so: 
+    # (+host+, +path+, +port+ = 80); so:
     #
     #    Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
     #
@@ -362,7 +371,7 @@ module Net   #:nodoc:
     # Send a GET request to the target and return the response
     # as a string.  The target can either be specified as
     # (+uri+), or as (+host+, +path+, +port+ = 80); so:
-    # 
+    #
     #    print Net::HTTP.get(URI.parse('http://www.example.com/index.html'))
     #
     # or:
@@ -376,7 +385,7 @@ module Net   #:nodoc:
     # Send a GET request to the target and return the response
     # as a Net::HTTPResponse object.  The target can either be specified as
     # (+uri+), or as (+host+, +path+, +port+ = 80); so:
-    # 
+    #
     #    res = Net::HTTP.get_response(URI.parse('http://www.example.com/index.html'))
     #    print res.body
     #
@@ -481,14 +490,14 @@ module Net   #:nodoc:
       port = https_default_port if !port && opt && opt[:use_ssl]
       http = new(address, port, p_addr, p_port, p_user, p_pass)
 
-      #if opt
-      #  opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt) if opt[:use_ssl]
-      #  http.methods.grep(/\A(\w+)=\z/) do |meth|
-      #    key = $1.to_sym
-      #    opt.key?(key) or next
-      #    http.__send__(meth, opt[key])
-      #  end
-     # end
+      if opt
+        opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt) if opt[:use_ssl]
+        http.methods.grep(/\A(\w+)=\z/) do |meth|
+          key = $1.to_sym
+          opt.key?(key) or next
+          http.__send__(meth, opt[key])
+        end
+      end
 
       http.start(&block)
     end
@@ -584,11 +593,37 @@ module Net   #:nodoc:
 
     # returns true if use SSL/TLS with HTTP.
     def use_ssl?
-      false   # redefined in net/https
+      @use_ssl
+    end
+
+    # Turn on/off SSL.
+    # This flag must be set before starting session.
+    # If you change use_ssl value after session started,
+    # a Net::HTTP object raises IOError.
+    def use_ssl=(flag)
+      flag = (flag ? true : false)
+      if started? and @use_ssl != flag
+        raise IOError, "use_ssl value changed, but session already started"
+      end
+      @use_ssl = flag
+    end
+
+    SSL_ATTRIBUTES = %w(
+      ssl_version key cert ca_file ca_path cert_store ciphers
+      verify_mode verify_callback verify_depth ssl_timeout
+    )
+    attr_accessor(*SSL_ATTRIBUTES)
+
+    # return the X.509 certificates the server presented.
+    def peer_cert
+      if not use_ssl? or not @socket
+        return nil
+      end
+      @socket.io.peer_cert
     end
 
     # Opens TCP connection and HTTP session.
-    # 
+    #
     # When this method is called with block, gives a HTTP object
     # to the block and closes the TCP connection / HTTP session
     # after the block executed.
@@ -628,9 +663,9 @@ module Net   #:nodoc:
         iv_list = instance_variables
         SSL_ATTRIBUTES.each do |name|
           ivname = "@#{name}".intern
-          if iv_list.include?(ivname)
-	   
-            ssl_parameters[name] = value if value = instance_variable_get(ivname)
+          if iv_list.include?(ivname) and
+             value = instance_variable_get(ivname)
+            ssl_parameters[name] = value
           end
         end
         if platform != 'Blackberry'
@@ -659,12 +694,12 @@ module Net   #:nodoc:
             @socket.writeline ''
             HTTPResponse.read_new(@socket).value
           end
-	  if platform != 'Blackberry'
+          if platform != 'Blackberry'
             timeout(@open_timeout) { s.connect }
             if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
               s.post_connection_check(@address)
             end
-	  end   
+          end
         rescue => exception
           D "Conn close because of connect error #{exception}"
           @socket.close if @socket and not @socket.closed?
@@ -673,7 +708,6 @@ module Net   #:nodoc:
       end
       on_connect
     end
-    
     private :connect
 
     def on_connect
@@ -711,9 +745,9 @@ module Net   #:nodoc:
     # Arguments are address/port of proxy host and username/password
     # if authorization on proxy server is required.
     # You can replace the HTTP class with created proxy class.
-    # 
+    #
     # If ADDRESS is nil, this method returns self (Net::HTTP).
-    # 
+    #
     #     # Example
     #     proxy_class = Net::HTTP::Proxy('proxy.example.com', 8080)
     #                     :
@@ -721,7 +755,7 @@ module Net   #:nodoc:
     #       # connecting proxy.foo.org:8080
     #                     :
     #     }
-    # 
+    #
     def HTTP.Proxy(p_addr, p_port = nil, p_user = nil, p_pass = nil)
       return self unless p_addr
       delta = ProxyDelta
@@ -821,14 +855,14 @@ module Net   #:nodoc:
     # and it defaults to an empty hash.
     # If +initheader+ doesn't have the key 'accept-encoding', then
     # a value of "gzip;q=1.0,deflate;q=0.6,identity;q=0.3" is used,
-    # so that gzip compression is used in preference to deflate 
-    # compression, which is used in preference to no compression. 
+    # so that gzip compression is used in preference to deflate
+    # compression, which is used in preference to no compression.
     # Ruby doesn't have libraries to support the compress (Lempel-Ziv)
     # compression, so that is not supported.  The intent of this is
     # to reduce bandwidth by default.   If this routine sets up
     # compression, then it does the decompression also, removing
     # the header as well to prevent confusion.  Otherwise
-    # it leaves the body as it found it. 
+    # it leaves the body as it found it.
     #
     # In version 1.1 (ruby 1.6), this method returns a pair of objects,
     # a Net::HTTPResponse object and the entity body string.
@@ -843,7 +877,7 @@ module Net   #:nodoc:
     # +dest+ argument is obsolete.
     # It still works but you must not use it.
     #
-    # In version 1.1, this method might raise an exception for 
+    # In version 1.1, this method might raise an exception for
     # 3xx (redirect). In this case you can get a HTTPResponse object
     # by "anException.response".
     #
@@ -854,7 +888,7 @@ module Net   #:nodoc:
     #
     #     # version 1.2 (bundled with Ruby 1.8 or later)
     #     response = http.get('/index.html')
-    #     
+    #
     #     # using block
     #     File.open('result.txt', 'w') {|f|
     #       http.get('/~foo/') do |str|
@@ -878,14 +912,14 @@ module Net   #:nodoc:
           the_body = r.read_body dest, &block
           case r["content-encoding"]
           when "gzip"
-            r.body= Zlib::GzipReader.new(StringIO.new(the_body), encoding => "ASCII-8BIT").read
+            r.body= Zlib::GzipReader.new(StringIO.new(the_body), encoding: "ASCII-8BIT").read
             r.delete("content-encoding")
           when "deflate"
             r.body= Zlib::Inflate.inflate(the_body);
             r.delete("content-encoding")
           when "identity"
             ; # nothing needed
-          else 
+          else
             ; # Don't do anything dramatic, unless we need to later
           end
         else
@@ -903,21 +937,21 @@ module Net   #:nodoc:
 
     # Gets only the header from +path+ on the connected-to host.
     # +header+ is a Hash like { 'Accept' => '*/*', ... }.
-    # 
+    #
     # This method returns a Net::HTTPResponse object.
-    # 
-    # In version 1.1, this method might raise an exception for 
+    #
+    # In version 1.1, this method might raise an exception for
     # 3xx (redirect). On the case you can get a HTTPResponse object
     # by "anException.response".
     # In version 1.2, this method never raises an exception.
-    # 
+    #
     #     response = nil
     #     Net::HTTP.start('some.www.server', 80) {|http|
     #       response = http.head('/index.html')
     #     }
     #     p response['content-type']
     #
-    def head(path, initheader = nil) 
+    def head(path, initheader = nil)
       res = request(Head.new(path, initheader))
       res.value unless @newimpl
       res
@@ -925,11 +959,11 @@ module Net   #:nodoc:
 
     # Posts +data+ (must be a String) to +path+. +header+ must be a Hash
     # like { 'Accept' => '*/*', ... }.
-    # 
+    #
     # In version 1.1 (ruby 1.6), this method returns a pair of objects, a
     # Net::HTTPResponse object and an entity body string.
     # In version 1.2 (ruby 1.8), this method returns a Net::HTTPResponse object.
-    # 
+    #
     # If called with a block, yields each fragment of the
     # entity body in turn as a string as it are read from
     # the socket.  Note that in this case, the returned response
@@ -937,18 +971,18 @@ module Net   #:nodoc:
     #
     # +dest+ argument is obsolete.
     # It still works but you must not use it.
-    # 
-    # In version 1.1, this method might raise an exception for 
+    #
+    # In version 1.1, this method might raise an exception for
     # 3xx (redirect). In this case you can get an HTTPResponse object
     # by "anException.response".
     # In version 1.2, this method never raises exception.
-    # 
+    #
     #     # version 1.1
     #     response, body = http.post('/cgi-bin/search.rb', 'query=foo')
-    # 
+    #
     #     # version 1.2
     #     response = http.post('/cgi-bin/search.rb', 'query=foo')
-    # 
+    #
     #     # using block
     #     File.open('result.txt', 'w') {|f|
     #       http.post('/cgi-bin/search.rb', 'query=foo') do |str|
@@ -1041,21 +1075,21 @@ module Net   #:nodoc:
 
     # Sends a GET request to the +path+ and gets a response,
     # as an HTTPResponse object.
-    # 
+    #
     # When called with a block, yields an HTTPResponse object.
     # The body of this response will not have been read yet;
     # the caller can process it using HTTPResponse#read_body,
     # if desired.
     #
     # Returns the response.
-    # 
+    #
     # This method never raises Net::* exceptions.
-    # 
+    #
     #     response = http.request_get('/index.html')
     #     # The entity body is already read here.
     #     p response['content-type']
     #     puts response.body
-    # 
+    #
     #     # using block
     #     http.request_get('/index.html') {|response|
     #       p response['content-type']
@@ -1072,9 +1106,9 @@ module Net   #:nodoc:
     # as an HTTPResponse object.
     #
     # Returns the response.
-    # 
+    #
     # This method never raises Net::* exceptions.
-    # 
+    #
     #     response = http.request_head('/index.html')
     #     p response['content-type']
     #
@@ -1084,21 +1118,21 @@ module Net   #:nodoc:
 
     # Sends a POST request to the +path+ and gets a response,
     # as an HTTPResponse object.
-    # 
+    #
     # When called with a block, yields an HTTPResponse object.
     # The body of this response will not have been read yet;
     # the caller can process it using HTTPResponse#read_body,
     # if desired.
     #
     # Returns the response.
-    # 
+    #
     # This method never raises Net::* exceptions.
-    # 
+    #
     #     # example
     #     response = http.request_post('/cgi-bin/nice.rb', 'datadatadata...')
     #     p response.status
     #     puts response.body          # body is already read
-    # 
+    #
     #     # using block
     #     http.request_post('/cgi-bin/nice.rb', 'datadatadata...') {|response|
     #       p response.status
@@ -1126,7 +1160,7 @@ module Net   #:nodoc:
     # This method also sends DATA string if DATA is given.
     #
     # Returns a HTTPResponse object.
-    # 
+    #
     # This method never raises Net::* exceptions.
     #
     #    response = http.send_request('GET', '/index.html')
@@ -1140,14 +1174,14 @@ module Net   #:nodoc:
     # Sends an HTTPRequest object REQUEST to the HTTP server.
     # This method also sends DATA string if REQUEST is a post/put request.
     # Giving DATA for get/head request causes ArgumentError.
-    # 
+    #
     # When called with a block, yields an HTTPResponse object.
     # The body of this response will not have been read yet;
     # the caller can process it using HTTPResponse#read_body,
     # if desired.
     #
     # Returns a HTTPResponse object.
-    # 
+    #
     # This method never raises Net::* exceptions.
     #
     def request(req, body = nil, &block)  # :yield: +response+
@@ -1381,7 +1415,7 @@ module Net   #:nodoc:
     alias each_key each_name
 
     # Iterates for each capitalized header names.
-    def each_capitalized_name   #:yield: +key+
+    def each_capitalized_name  #:yield: +key+
       block_given? or return enum_for(__method__)
       @header.each_key do |k|
         yield capitalize(k)
@@ -1489,7 +1523,7 @@ module Net   #:nodoc:
           raise HTTPHeaderSyntaxError, 'wrong Content-Length format'
       len.to_i
     end
-    
+
     def content_length=(len)
       unless len
         @header.delete 'content-length'
@@ -1499,7 +1533,7 @@ module Net   #:nodoc:
     end
 
     # Returns "true" if the "transfer-encoding" header is present and
-    # set to "chunked".  This is an HTTP/1.1 feature, allowing the 
+    # set to "chunked".  This is an HTTP/1.1 feature, allowing the
     # the content to be sent in "chunks" without at the outset
     # stating the entire content length.
     def chunked?
@@ -1540,7 +1574,7 @@ module Net   #:nodoc:
       return nil unless @header['content-type']
       self['Content-Type'].split(';').first.to_s.split('/')[0].to_s.strip
     end
-    
+
     # Returns a content type string such as "html".
     # This method returns nil if Content-Type: header field does not exist
     # or sub-type is not given (e.g. "Content-Type: text").
@@ -1583,7 +1617,7 @@ module Net   #:nodoc:
     #    http.form_data = {"q" => "ruby", "lang" => "en"}
     #    http.form_data = {"q" => ["ruby", "perl"], "lang" => "en"}
     #    http.set_form_data({"q" => "ruby", "lang" => "en"}, ';')
-    #    
+    #
     def set_form_data(params, sep = '&')
       self.body = params.map {|k, v| encode_kvpair(k, v) }.flatten.join(sep)
       self.content_type = 'application/x-www-form-urlencoded'
@@ -1759,14 +1793,14 @@ module Net   #:nodoc:
       buf << "\r\n"
       sock.write buf
     end
-  
+
   end
 
 
-  # 
+  #
   # HTTP request class. This class wraps request header and entity path.
   # You *must* use its subclass, Net::HTTP::Get, Post, Head.
-  # 
+  #
   class HTTPRequest < HTTPGenericRequest
 
     # Creates HTTP request object.
@@ -1906,17 +1940,17 @@ module Net   #:nodoc:
   # HTTP response class. This class wraps response header and entity.
   # Mixes in the HTTPHeader module, which provides access to response
   # header values both via hash-like methods and individual readers.
-  # Note that each possible HTTP response code defines its own 
+  # Note that each possible HTTP response code defines its own
   # HTTPResponse subclass.  These are listed below.
   # All classes are
   # defined under the Net module. Indentation indicates inheritance.
-  # 
+  #
   #   xxx        HTTPResponse
-  # 
+  #
   #     1xx        HTTPInformation
-  #       100        HTTPContinue    
+  #       100        HTTPContinue
   #       101        HTTPSwitchProtocol
-  # 
+  #
   #     2xx        HTTPSuccess
   #       200        HTTPOK
   #       201        HTTPCreated
@@ -1925,7 +1959,7 @@ module Net   #:nodoc:
   #       204        HTTPNoContent
   #       205        HTTPResetContent
   #       206        HTTPPartialContent
-  # 
+  #
   #     3xx        HTTPRedirection
   #       300        HTTPMultipleChoice
   #       301        HTTPMovedPermanently
@@ -1934,7 +1968,7 @@ module Net   #:nodoc:
   #       304        HTTPNotModified
   #       305        HTTPUseProxy
   #       307        HTTPTemporaryRedirect
-  # 
+  #
   #     4xx        HTTPClientError
   #       400        HTTPBadRequest
   #       401        HTTPUnauthorized
@@ -1954,7 +1988,7 @@ module Net   #:nodoc:
   #       415        HTTPUnsupportedMediaType
   #       416        HTTPRequestedRangeNotSatisfiable
   #       417        HTTPExpectationFailed
-  # 
+  #
   #     5xx        HTTPServerError
   #       500        HTTPInternalServerError
   #       501        HTTPNotImplemented
@@ -1962,7 +1996,7 @@ module Net   #:nodoc:
   #       503        HTTPServiceUnavailable
   #       504        HTTPGatewayTimeOut
   #       505        HTTPVersionNotSupported
-  # 
+  #
   #     xxx        HTTPUnknownResponse
   #
   class HTTPResponse
@@ -2235,7 +2269,7 @@ module Net   #:nodoc:
 
     # next is to fix bug in RDoc, where the private inside class << self
     # spills out.
-    public 
+    public
 
     include HTTPHeader
 
@@ -2268,7 +2302,7 @@ module Net   #:nodoc:
     # To allow Net::HTTP 1.1 style assignment
     # e.g.
     #    response, body = Net::HTTP.get(....)
-    # 
+    #
     def to_ary
       warn "net/http.rb: warning: Net::HTTP v1.1 style assignment found at #{caller(1)[0]}; use `response = http.get(...)' instead." if $VERBOSE
       res = self.dup