Fix two use cases of PROXYHOST/PROXYPORT

Author: HD Moore

lib/msf/core/handler/reverse_hop_http.rb

@@ -256,8 +256,8 @@ def send_new_stage
       :expiration     => datastore['SessionExpirationTimeout'],
       :comm_timeout   => datastore['SessionCommunicationTimeout'],
       :ua             => datastore['MeterpreterUserAgent'],
-      :proxyhost      => datastore['PROXYHOST'],
-      :proxyport      => datastore['PROXYPORT'],
+      :proxyhost      => datastore['PROXY_HOST'],
+      :proxyport      => datastore['PROXY_PORT'],
       :proxy_type     => datastore['PROXY_TYPE'],
       :proxy_username => datastore['PROXY_USERNAME'],
       :proxy_password => datastore['PROXY_PASSWORD']

lib/msf/core/handler/reverse_http.rb

@@ -299,8 +299,8 @@ def on_request(cli, req, obj)
           :expiration     => datastore['SessionExpirationTimeout'],
           :comm_timeout   => datastore['SessionCommunicationTimeout'],
           :ua             => datastore['MeterpreterUserAgent'],
-          :proxyhost      => datastore['PROXYHOST'],
-          :proxyport      => datastore['PROXYPORT'],
+          :proxyhost      => datastore['PROXY_HOST'],
+          :proxyport      => datastore['PROXY_PORT'],
           :proxy_type     => datastore['PROXY_TYPE'],
           :proxy_username => datastore['PROXY_USERNAME'],
           :proxy_password => datastore['PROXY_PASSWORD']